[Jifty-commit] r7454 - in jifty/trunk: lib/Jifty share/web/static/js

[Jifty commits]

Author: sartak
Date: Thu Aug 27 03:19:30 2009
New Revision: 7454

Modified:
   jifty/trunk/lib/Jifty/Web.pm
   jifty/trunk/share/web/static/css/facebox.css
   jifty/trunk/share/web/static/css/main.css
   jifty/trunk/share/web/static/js/facebox.js

Log:
Integrate facebox into jifty

Modified: jifty/trunk/lib/Jifty/Web.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Web.pm	(original)
+++ jifty/trunk/lib/Jifty/Web.pm	Thu Aug 27 03:19:30 2009
@@ -44,6 +44,7 @@
     jifty_interface.js
     jquery_noconflict.js
     jquery.jgrowl.js
+    facebox.js
     behaviour.js
     formatDate.js
     jifty.js

Modified: jifty/trunk/share/web/static/css/facebox.css
==============================================================================
--- jifty/trunk/share/web/static/css/facebox.css	(original)
+++ jifty/trunk/share/web/static/css/facebox.css	Thu Aug 27 03:19:30 2009
@@ -2,23 +2,23 @@
  * changes before upgrading */
 
 #facebox .b {
-  background:url(/image/facebox/b.png);
+  background:url(/images/facebox/b.png);
 }
 
 #facebox .tl {
-  background:url(/image/facebox/tl.png);
+  background:url(/images/facebox/tl.png);
 }
 
 #facebox .tr {
-  background:url(/image/facebox/tr.png);
+  background:url(/images/facebox/tr.png);
 }
 
 #facebox .bl {
-  background:url(/image/facebox/bl.png);
+  background:url(/images/facebox/bl.png);
 }
 
 #facebox .br {
-  background:url(/image/facebox/br.png);
+  background:url(/images/facebox/br.png);
 }
 
 #facebox {

Modified: jifty/trunk/share/web/static/css/main.css
==============================================================================
--- jifty/trunk/share/web/static/css/main.css	(original)
+++ jifty/trunk/share/web/static/css/main.css	Thu Aug 27 03:19:30 2009
@@ -17,5 +17,6 @@
 @import "notices.css";
 @import "jquery.jgrowl.css";
 @import "jquery.timepickr.css";
+ at import "facebox.css";
 @import "datetime.css";
 @import "app-late.css";

Modified: jifty/trunk/share/web/static/js/facebox.js
==============================================================================
--- jifty/trunk/share/web/static/js/facebox.js	(original)
+++ jifty/trunk/share/web/static/js/facebox.js	Thu Aug 27 03:19:30 2009
@@ -82,8 +82,8 @@
     settings: {
       opacity      : 0,
       overlay      : true,
-      loadingImage : '/image/facebox/loading.gif',
-      closeImage   : '/image/facebox/closelabel.gif',
+      loadingImage : '/images/facebox/loading.gif',
+      closeImage   : '/images/facebox/closelabel.gif',
       imageTypes   : [ 'png', 'jpg', 'jpeg', 'gif' ],
       faceboxHtml  : '\
     <div id="facebox" style="display:none;"> \
@@ -100,7 +100,7 @@
                 </div> \
                 <div class="footer"> \
                   <a href="#" class="close"> \
-                    <img src="/image/facebox/closelabel.gif" title="close" class="close_image" /> \
+                    <img src="/images/facebox/closelabel.gif" title="close" class="close_image" /> \
                   </a> \
                 </div> \
               </td> \