integrate new icons (#4869)

askbot/templates/question/answer_controls.html

@@ -12,21 +12,7 @@
 >
     <a class="question-flag">{% trans %}remove flag{% endtrans %}</a>
 </span>
-<span 
-    id="answer-offensive-flag-{{ answer.id }}"
-    class="action-link offensive-flag"
-    title="{% trans %}report as offensive (i.e containing spam, advertising, malicious text, etc.){% endtrans %}"
->
-    <a class="question-flag">{% trans %}flag offensive{% endtrans %} ({{ answer.offensive_flag_count }})</a>
-</span>
 {% else %}
-<span 
-    id="answer-offensive-flag-{{ answer.id }}"
-    class="action-link offensive-flag"
-    title="{% trans %}report as offensive (i.e containing spam, advertising, malicious text, etc.){% endtrans %}"
->
-    <a class="question-flag">{% trans %}flag offensive{% endtrans %}</a>
-</span>
 {% endif %}
 <span id='post-{{answer.id}}-delete' class="action-link delete-post">
     <a class="question-delete"
@@ -48,13 +34,6 @@
         >{% trans %}publish{% endtrans %}</a>
     {% endif %}
 </span>
-<span class="action-link">
-    <a  class="permant-link"
-        href="{{ answer.get_absolute_url(question_post=question) }}"
-        title="{% trans %}permanent link{% endtrans %}">
-        {% trans %}link{% endtrans %}
-    </a>
-</span>
 <span class="action-link dropdown-toggle">{% trans %}more{% endtrans %}
 <ul class="dropdown-menu">
     <li id='post-{{answer.id}}-convert'>

askbot/templates/question/question_controls.html

@@ -11,19 +11,7 @@
     >
         <a class="question-flag">{% trans %}remove flag{% endtrans %}</a>
     </span>
-    <span
-        id="question-offensive-flag-{{ question.id }}" class="offensive-flag"
-        title="{% trans %}report as offensive (i.e containing spam, advertising, malicious text, etc.){% endtrans %}"
-    >
-        <a class="question-flag">{% trans %}flag offensive{% endtrans %} ({{ question.offensive_flag_count }})</a>
-    </span>
 {% else %}
-    <span
-        id="question-offensive-flag-{{ question.id }}" class="offensive-flag"
-        title="{% trans %}report as offensive (i.e containing spam, advertising, malicious text, etc.){% endtrans %}"
-    >
-        <a class="question-flag">{% trans %}flag offensive{% endtrans %}</a>
-    </span>
 {% endif %}
 {% if thread.closed %}
     <a class="question-close" href="{% url reopen question.id %}">{% trans %}reopen{% endtrans %}</a>

skins/bistro/media/css/extra.css

@@ -568,3 +568,22 @@ input[type="submit"].searchBtn:hover {
 	line-height: 130%;
 	margin: 1em 0 1ex 0;
 }
+
+.question-page .post-controls .question-delete {
+	background: url(../images/icons/trash-orange.png) 0 0 no-repeat;
+	padding: 12px 0 12px 32px;
+}
+
+.question-page .post-controls .question-close {
+	background: url(../images/icons/close-orange.png) 0 8px no-repeat;
+	padding: 12px 0 12px 22px;
+}
+
+.question-page .post-controls .question-edit {
+	background: url(../images/icons/edit-orange.png) 0 8px no-repeat;
+	padding: 12px 0 12px 22px;
+}
+.question-page .comments .controls a {
+	background-image: url(../images/icons/answer-orange.png);
+	padding: 12px 0 12px 32px;
+}

skins/bistro/pencil.svg

@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="210mm"
+   height="297mm"
+   id="svg7280"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="Nouveau document 3">
+  <defs
+     id="defs7282" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="3.959798"
+     inkscape:cx="459.76114"
+     inkscape:cy="479.5939"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1280"
+     inkscape:window-height="736"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata7285">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Calque 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <g
+       id="g8165"
+       inkscape:export-xdpi="65.68"
+       inkscape:export-ydpi="65.68">
+      <path
+         d="m 467.45957,571.58975 8.046,8.046 -11.732,11.75 -0.365,0.364 -13.196,4.24 5.191,-12.378 12.056,-12.022 m 0,-2.2 c -0.563,0 -1.124,0.214 -1.554,0.643 l -12.057,12.023 c -0.203,0.202 -0.364,0.442 -0.475,0.707 l -5.191,12.378 c -0.333,0.792 -0.174,1.705 0.407,2.338 0.424,0.461 1.015,0.713 1.621,0.713 0.225,0 0.452,-0.035 0.673,-0.105 l 13.196,-4.24 c 0.332,-0.107 0.634,-0.291 0.881,-0.537 l 0.365,-0.364 11.735,-11.754 c 0.858,-0.859 0.857,-2.251 -10e-4,-3.11 l -8.046,-8.046 c -0.428,-0.431 -0.99,-0.646 -1.554,-0.646 l 0,0 z"
+         id="path1393"
+         inkscape:connector-curvature="0"
+         style="fill:#ffffff" />
+      <g
+         transform="translate(358.85157,310.71375)"
+         id="g1395">
+        <g
+           id="g1397">
+          <path
+             d="m 91.36,285.877 c -0.166,0 -0.327,-0.069 -0.442,-0.195 -0.158,-0.173 -0.201,-0.422 -0.11,-0.638 l 5.164,-12.247 c 0.036,-0.085 0.091,-0.161 0.159,-0.22 0.396,-0.377 8.819,-8.865 12.052,-12.124 0.112,-0.113 0.265,-0.177 0.425,-0.178 h 10e-4 c 0.159,0 0.312,0.063 0.424,0.176 l 8.046,8.046 c 0.234,0.234 0.234,0.614 0.001,0.848 l -12.099,12.116 c -0.067,0.067 -0.149,0.117 -0.24,0.146 l -13.196,4.24 c -0.062,0.021 -0.123,0.03 -0.185,0.03 l 0,0 z"
+             id="path1399"
+             inkscape:connector-curvature="0"
+             style="fill:#7b0f47" />
+          <path
+             d="m 108.608,260.876 8.046,8.046 -11.732,11.75 -0.365,0.364 -13.196,4.24 5.164,-12.247 c 0.041,-0.012 12.083,-12.153 12.083,-12.153 m 0,-1.2 c -0.001,0 -0.002,0 -0.003,0 -0.318,0.001 -0.624,0.128 -0.849,0.355 -4.619,4.657 -11.589,11.677 -12.033,12.105 -0.131,0.117 -0.235,0.262 -0.305,0.427 l -5.164,12.247 c -0.183,0.432 -0.097,0.931 0.221,1.276 0.23,0.253 0.554,0.39 0.885,0.39 0.123,0 0.246,-0.019 0.367,-0.058 l 13.196,-4.24 c 0.181,-0.058 0.346,-0.159 0.48,-0.293 l 0.365,-0.364 11.734,-11.752 c 0.468,-0.469 0.467,-1.229 -10e-4,-1.697 l -8.046,-8.046 c -0.224,-0.224 -0.528,-0.35 -0.847,-0.35 l 0,0 z"
+             id="path1401"
+             inkscape:connector-curvature="0"
+             style="fill:#7f4f0d;fill-opacity:1" />
+        </g>
+      </g>
+      <g
+         transform="translate(358.85157,310.71375)"
+         id="g1403">
+        <path
+           d="m 96.524,273.03 -5.164,12.247 13.196,-4.24 c 0.001,0 1.29,-8.874 -8.032,-8.007 z"
+           id="path1405"
+           inkscape:connector-curvature="0"
+           style="fill:#f8c97f" />
+        <path
+           d="M 108.608,260.876 96.524,273.03 h 0.601 c 0.151,0 0.677,0.026 0.988,0.37 0.2,0.22 0.28,0.542 0.239,0.956 l -0.024,0.273 h 0.273 c 0.175,0 4.307,0.049 4.307,4.308 l 0.001,0.336 0.322,-0.1 c 0.002,0 0.123,-0.038 0.287,-0.038 0.751,0 1.059,0.793 1.1,1.412 l -0.062,0.49 12.098,-12.115 -8.046,-8.046 z"
+           id="path1407"
+           inkscape:connector-curvature="0"
+           style="fill:#f5b248;fill-opacity:1" />
+        <path
+           d="m 97.145,281.253 c -0.908,-1.287 -1.87,-1.917 -3.235,-2.333 l -2.739,6.537 6.948,-2.232 c -0.21,-0.748 -0.447,-1.225 -0.974,-1.972 z"
+           id="path1409"
+           inkscape:connector-curvature="0"
+           style="fill:#383838;fill-opacity:1" />
+        <path
+           d="M 108.608,260.876 96.524,273.03 h 0.601 c 0.151,0 0.677,0.026 0.988,0.37 0.2,0.22 0.28,0.542 0.239,0.956 l -0.024,0.273 12.36,-11.671 -2.08,-2.082 z"
+           id="path1411"
+           inkscape:connector-curvature="0"
+           style="fill:#f8c97f;fill-opacity:1" />
+        <path
+           d="m 116.654,268.922 -12.098,12.115 0.062,-0.49 c -0.041,-0.619 -0.349,-1.412 -1.1,-1.412 -0.164,0 -0.285,0.038 -0.287,0.038 l -0.322,0.1 12.048,-12.047 1.697,1.696 z"
+           id="path1413"
+           inkscape:connector-curvature="0"
+           style="opacity:0.59999999999999998;fill:#bb770a;fill-opacity:1" />
+      </g>
+      <g
+         transform="translate(358.85157,310.71375)"
+         id="g1415">
+        <path
+           d="M 98.602,274.381"
+           id="path1417"
+           inkscape:connector-curvature="0"
+           style="fill:#b195c1;stroke:#632c84;stroke-width:1.29209995;stroke-linecap:round;stroke-linejoin:round" />
+      </g>
+    </g>
+  </g>
+</svg>