Changeset 5293

Timestamp:

08/12/11 09:21:41 (9 months ago)

Author:

esanchez

Message:

Change the behaviour when checking for missing images. Fixes #2205

Location:

trunk/merengueproj/merengue

Files:

• base/templates/base/layout.html (modified) (1 diff)
• media/css/style.css (modified) (1 diff)

trunk/merengueproj/merengue/base/templates/base/layout.html

@@ -54 +54 @@
 
 {% block debug %}
-  {% if debug %}
+  {% if debug and PUBLIC_SERVER %}
     <script type="text/javascript">
     (function($) {
         $(document).ready(function () {
           var server = '{{ PUBLIC_SERVER }}';
-          var i=0;
+          var i = 0;
+          if (server.slice(-1) != '/') {
+              server = server + '/';
+          }
           jQuery("img").filter(function (e, v) {
             if (v.naturalHeight === 0 && v.naturalWidth === 0) {
-              if (server != 'false') {
-                  v.setAttribute("src", server + v.getAttribute("src"));
+              var src = v.getAttribute("src");
+              if (src[0] == '/') {
+                  v.setAttribute("src", server + src.slice(1));
                   v.addClass("serverImage");
+                  i += 1;
               }
-              i+=1;
             }
           });
-          if (server === 'false' && i>0){
-              alert('There are ' + i + ' images broken, you could configure settings.PUBLIC_SERVER to take them from your server.');
+          if (i) {
+              jQuery("body").append('<div class="serverImageInfo">' + i + ' {% trans "images are retrived from your defined PUBLIC_SERVER" %}: ' + server + '</div>');
+              jQuery(".serverImageInfo").mouseenter(function () {
+                  jQuery(".serverImage").addClass('serverImageHover');
+              });
+              jQuery(".serverImageInfo").mouseleave(function () {
+                  jQuery(".serverImage").removeClass('serverImageHover');
+              });
           }
         });

trunk/merengueproj/merengue/media/css/style.css

@@ -140 +140 @@
 }
 
+div.serverImageInfo {
+    position: fixed;
+    top: 75px;
+    left: 0px;
+    width: 100px;
+    padding: 1em 2em;
+    border: 1px solid gray;
+    border-left-width: 0px;
+    font-size: 10px;
+    background: #ffffdd;
+    opacity: 0.7;
+    filter:alpha(opacity=7);
+}
+
 img.serverImage {
     opacity: 0.7;
     filter:alpha(opacity=7);
+}
+
+img.serverImageHover {
+    outline: 2px dotted red;
 }