[damned-lies] Merged media/newimg folder into media/img and removed non-used images



commit 4ebed867ac87358791079165ac0e2e9f30088b55
Author: Gil Forcada <gforcada gnome org>
Date:   Sun Sep 30 18:58:54 2012 +0200

    Merged media/newimg folder into media/img and removed non-used images

 media/css/template.css                     |   37 +++++++++++++--------------
 media/img/bar.png                          |  Bin 154 -> 0 bytes
 media/img/cyan-bar.png                     |  Bin 221 -> 0 bytes
 media/{newimg => img}/download-icon.png    |  Bin 426 -> 426 bytes
 media/img/error.png                        |  Bin 292 -> 0 bytes
 media/{newimg => img}/favicon.png          |  Bin 895 -> 895 bytes
 media/img/foot.png                         |  Bin 699 -> 4414 bytes
 media/{newimg => img}/footer_arts/l10n.png |  Bin 6668 -> 6668 bytes
 media/img/general_bg.png                   |  Bin 178 -> 0 bytes
 media/img/general_separator.png            |  Bin 212 -> 0 bytes
 media/img/gnome-64.png                     |  Bin 4385 -> 0 bytes
 media/img/gnome-gtp.png                    |  Bin 4208 -> 0 bytes
 media/{newimg => img}/grass.png            |  Bin 10178 -> 10178 bytes
 media/img/green-bar.png                    |  Bin 253 -> 0 bytes
 media/{newimg => img}/hr-shadow.png        |  Bin 1189 -> 1189 bytes
 media/{newimg => img}/html-bg.png          |  Bin 312 -> 312 bytes
 media/img/info.png                         |  Bin 417 -> 0 bytes
 media/img/purple-bar.png                   |  Bin 227 -> 0 bytes
 media/img/red-bar.png                      |  Bin 228 -> 0 bytes
 media/{newimg => img}/repository-icon.png  |  Bin 404 -> 404 bytes
 media/img/star.png                         |  Bin 2871 -> 0 bytes
 media/img/t.png                            |  Bin 317 -> 0 bytes
 media/img/tab_left.png                     |  Bin 371 -> 0 bytes
 media/img/tab_right.png                    |  Bin 1134 -> 0 bytes
 media/{newimg => img}/top_bar-bg.png       |  Bin 185 -> 185 bytes
 media/{newimg => img}/top_bar-item-bg.png  |  Bin 190 -> 190 bytes
 media/img/webpage.png                      |  Bin 675 -> 0 bytes
 media/newimg/focus-bg.png                  |  Bin 180 -> 0 bytes
 media/newimg/foot.png                      |  Bin 2545 -> 0 bytes
 media/newimg/globalnav-arrow.png           |  Bin 341 -> 0 bytes
 media/newimg/newfoot.png                   |  Bin 4414 -> 0 bytes
 media/newimg/top_bar-item-hover-bg.png     |  Bin 187 -> 0 bytes
 templates/base.html                        |    2 +-
 templates/module_detail.html               |    4 +-
 templates/stats_show.html                  |   18 +++++++-------
 35 files changed, 30 insertions(+), 31 deletions(-)
---
diff --git a/media/css/template.css b/media/css/template.css
index 8428433..6c29850 100644
--- a/media/css/template.css
+++ b/media/css/template.css
@@ -6,10 +6,10 @@
 /* ========================================================================== */
 
 html {
-    background: #fff url(../newimg/html-bg.png) 0 10px repeat-x;
+    background: #fff url(../img/html-bg.png) 0 10px repeat-x;
 }
 body {
-    
+
 }
 a {
     color: #204a87;
@@ -74,7 +74,7 @@ a:visited {
     color: #555753 !important;
     font-weight: bold;
     text-decoration: none;
-    background: #fff url(../newimg/favicon.png) 0 0 no-repeat;
+    background: #fff url(../img/favicon.png) 0 0 no-repeat;
     padding-left: 18px;
     border-right: 1px solid #ccc;
     padding-right: 6px;
@@ -173,11 +173,11 @@ a:visited {
 /* ========================================================================== */
 
 #globalnav {
-    background: #2e3436 url("../newimg/top_bar-bg.png") top repeat-x;
+    background: #2e3436 url("../img/top_bar-bg.png") top repeat-x;
     list-style: none;
     float: left;
     padding: 8px 0;
-    margin: 50px 0 0 45px; 
+    margin: 50px 0 0 45px;
     font-size: 13px;
     -moz-border-radius: 6px;
     -webkit-border-radius: 6px;
@@ -212,7 +212,7 @@ a:visited {
     background: rgba(100%, 100%, 100%, 0.15);
 }
 #globalnav li a:active {
-    background: #1c2021 url("../newimg/top_bar-item-bg.png") top repeat-x;
+    background: #1c2021 url("../img/top_bar-item-bg.png") top repeat-x;
     -moz-box-shadow: inset 0 -1px 0 rgba(100%,100%,100%, 0.4), inset 0 1px 3px rgba(0,0,0,0.4);
     -webkit-box-shadow: inset 0 -1px 0 rgba(100%,100%,100%, 0.4), inset 0 1px 3px rgba(0,0,0,0.4);
     box-shadow: inset 0 -1px 0 rgba(100%,100%,100%, 0.4), inset 0 1px 3px rgba(0,0,0,0.4);
@@ -220,7 +220,7 @@ a:visited {
 #globalnav li.active a {
     color: #fff;
     text-shadow: 0 1px 0 rgba(0, 0, 0, 0.5);
-    background: #1c2021 url("../newimg/top_bar-item-bg.png") top repeat-x;
+    background: #1c2021 url("../img/top_bar-item-bg.png") top repeat-x;
     -moz-box-shadow: inset 0 -1px 0 rgba(100%,100%,100%, 0.4), inset 0 1px 3px rgba(0,0,0,0.4);
     -webkit-box-shadow: inset 0 -1px 0 rgba(100%,100%,100%, 0.4), inset 0 1px 3px rgba(0,0,0,0.4);
     box-shadow: inset 0 -1px 0 rgba(100%,100%,100%, 0.4), inset 0 1px 3px rgba(0,0,0,0.4);
@@ -332,7 +332,7 @@ hr {
 hr.top_shadow,
 hr.bottom_shadow {
     height: 25px;
-    background: url(../newimg/hr-shadow.png) no-repeat bottom;
+    background: url(../img/hr-shadow.png) no-repeat bottom;
     background-size: contain;
     border: 0;
     margin: 40px 0;
@@ -461,11 +461,11 @@ div#vertimus_stats pre.stats {
     background: #ccc;
     overflow: hidden;
     position: relative;
-    
+
     -moz-border-radius: 10px;
     -webkit-border-radius: 10px;
     border-radius: 10px;
-    
+
     -moz-box-shadow: inset 0 1px 4px rgba(0, 0, 0, 0.3);
     -webkit-box-shadow: inset 0 1px 4px rgba(0, 0, 0, 0.3);
     box-shadow: inset 0 1px 4px rgba(0, 0, 0, 0.3);
@@ -521,7 +521,7 @@ div.graphinline {
     padding: 4px 8px;
     list-style: none;
     margin: 8px 0;
-    
+
     -moz-border-radius: 3px;
     -webkit-border-radius: 3px;
     border-radius: 3px;
@@ -605,14 +605,14 @@ div.graphinline {
     padding: 4px 12px;
     display: inline-block;
     line-height: 16px;
-    
+
     font-size: 13px;
     font-weight: normal;
-    
+
     -moz-border-radius: 4px;
     -webkit-border-radius: 4px;
     border-radius: 4px;
-    
+
     -moz-box-shadow: inset 0 -1px 2px rgba(0, 0, 0, 0.1);
     -webkit-box-shadow: inset 0 -1px 2px rgba(0, 0, 0, 0.1);
     box-shadow: inset 0 -1px 2px rgba(0, 0, 0, 0.1);
@@ -645,7 +645,7 @@ div.graphinline {
     margin-top: 10px;
     margin-bottom: -10px;
     overflow: auto;
-    
+
     -moz-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1);
     -webkit-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1);
     box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1);
@@ -727,7 +727,7 @@ div.face_image {
 	border: 1px solid #eee;
 	padding: 5px 25px 0 0;
 	background: #7fa7d4;
-    background: #fff url(../newimg/html-bg.png) 0 repeat-x;
+    background: #fff url(../img/html-bg.png) 0 repeat-x;
 	-moz-border-radius: 5px;
     -webkit-border-radius: 5px;
     border-radius: 5px;
@@ -881,13 +881,13 @@ ul.foot li {
     margin-top: 0;
 }
 #footer_art {
-    background-image: url(../newimg/footer_arts/l10n.png);
+    background-image: url(../img/footer_arts/l10n.png);
 }
 
 /* Footer Grass */
 
 #footer_grass {
-    background: url(../newimg/grass.png) top center repeat-x;
+    background: url(../img/grass.png) top center repeat-x;
     height: 39px;
     margin-top: -33px;
 }
@@ -958,4 +958,3 @@ ul.foot li {
 #footer #footnotes a {
     color: inherit;
 }
-
diff --git a/media/newimg/download-icon.png b/media/img/download-icon.png
similarity index 100%
rename from media/newimg/download-icon.png
rename to media/img/download-icon.png
diff --git a/media/newimg/favicon.png b/media/img/favicon.png
similarity index 100%
rename from media/newimg/favicon.png
rename to media/img/favicon.png
diff --git a/media/img/foot.png b/media/img/foot.png
index 1138da1..436cc24 100644
Binary files a/media/img/foot.png and b/media/img/foot.png differ
diff --git a/media/newimg/footer_arts/l10n.png b/media/img/footer_arts/l10n.png
similarity index 100%
rename from media/newimg/footer_arts/l10n.png
rename to media/img/footer_arts/l10n.png
diff --git a/media/newimg/grass.png b/media/img/grass.png
similarity index 100%
rename from media/newimg/grass.png
rename to media/img/grass.png
diff --git a/media/newimg/hr-shadow.png b/media/img/hr-shadow.png
similarity index 100%
rename from media/newimg/hr-shadow.png
rename to media/img/hr-shadow.png
diff --git a/media/newimg/html-bg.png b/media/img/html-bg.png
similarity index 100%
rename from media/newimg/html-bg.png
rename to media/img/html-bg.png
diff --git a/media/newimg/repository-icon.png b/media/img/repository-icon.png
similarity index 100%
rename from media/newimg/repository-icon.png
rename to media/img/repository-icon.png
diff --git a/media/newimg/top_bar-bg.png b/media/img/top_bar-bg.png
similarity index 100%
rename from media/newimg/top_bar-bg.png
rename to media/img/top_bar-bg.png
diff --git a/media/newimg/top_bar-item-bg.png b/media/img/top_bar-item-bg.png
similarity index 100%
rename from media/newimg/top_bar-item-bg.png
rename to media/img/top_bar-item-bg.png
diff --git a/templates/base.html b/templates/base.html
index b48d5a2..7129122 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -40,7 +40,7 @@
 
         <div class="maxwidth">
 
-            <h1><a href="{% url 'home' %}" title="{% trans "Back to Damned Lies home page" %}"><img src="{{ MEDIA_URL }}newimg/newfoot.png" alt="GNOME" /> {% trans "Damned Lies" %}</a></h1>
+            <h1><a href="{% url 'home' %}" title="{% trans "Back to Damned Lies home page" %}"><img src="{{ MEDIA_URL }}img/foot.png" alt="GNOME" /> {% trans "Damned Lies" %}</a></h1>
 
             <ul id="globalnav">
                 <li{% if pageSection == "home" %} class="active"{% endif %}><a href="{% url 'home' %}" title="{% trans "Back to Damned Lies home page" %}"><span>{% trans "Home" %}</span></a></li>
diff --git a/templates/module_detail.html b/templates/module_detail.html
index 7e1a711..1dde2d5 100644
--- a/templates/module_detail.html
+++ b/templates/module_detail.html
@@ -57,7 +57,7 @@ $(document).ready(function() {
       {% endfor %}
       {% endif %}
     </div>
-    
+
     <div class="bloc half">
       {% if module.bugs_base %}
       <h2>{% trans "Bug reporting" %}</h2>
@@ -97,7 +97,7 @@ $(document).ready(function() {
     {% endif %}
      <a name="{{ branch.name }}"></a>{{ branch.name }}
     {% if branch.get_vcs_web_url %}
-      <a href="{{ branch.get_vcs_web_url }}" title="{% trans 'Browse Repository' %}"><img src="{{ MEDIA_URL }}newimg/repository-icon.png" /></a>
+      <a href="{{ branch.get_vcs_web_url }}" title="{% trans 'Browse Repository' %}"><img src="{{ MEDIA_URL }}img/repository-icon.png" /></a>
     {% endif %}
     </h2>
     {% if forloop.counter < 3 %}
diff --git a/templates/stats_show.html b/templates/stats_show.html
index fc627ea..e5df553 100644
--- a/templates/stats_show.html
+++ b/templates/stats_show.html
@@ -3,21 +3,21 @@
 
 {% for dname, stat in stats.items %}
     {% with stat|first as pot_stat %}
-    
+
     <div class="stats_show">
-    
+
     <h3>{% trans pot_stat.domain.get_description %}
-        
+
         {% if pot_stat|domain_type == "mallard" %}
             <span style="padding-top: 8px;" class="icon_button"><img src="{{ MEDIA_URL }}img/mallard.png" title="{% trans "This document is written in Mallard documentation format" %}" alt="mallard icon"/></span>
         {% endif %}
 
         {% if pot_stat.full_po %}
-            <a href="{{ pot_stat.po_url }}" class="icon_button" title="{% trans 'Download POT file' %}"><img src="{{ MEDIA_URL }}newimg/download-icon.png" alt="{% trans 'Download POT file' %}" /></a>
+            <a href="{{ pot_stat.po_url }}" class="icon_button" title="{% trans 'Download POT file' %}"><img src="{{ MEDIA_URL }}img/download-icon.png" alt="{% trans 'Download POT file' %}" /></a>
         {% endif %}
-    
+
     </h3>
-    
+
     {% if pot_stat.domain.directory != 'help' and pot_stat.domain.directory != 'po' %}
     <p class="path">{{ pot_stat.domain.directory }}</p>
     {% endif %}
@@ -31,7 +31,7 @@
             {% for msg in pot_stat.informations %}
                 <div class="item">
                     {{ msg.get_description|safe }}
-                    
+
                     {% if user.is_authenticated %}
                         {% if msg.type == 'error' or msg.type == 'error-ext' %}
                         <div class="actions">
@@ -88,8 +88,8 @@
     {% endif %}
     {% endfor %}
     </table>
-    
+
     </div>
-    
+
     {% endwith %}
 {% endfor %}



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]