From fd54a5010a22ccf359b94e4e46f39883e8ddca15 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Tue, 16 Jun 2009 21:41:44 -0700
Subject: Fix for ticket #328. Basically copied the default/views/pager.html to
 admin_default/views/pager.html and change the message to reflect the original
 comment message.

---
 themes/admin_default/views/pager.html.php | 32 +++++++++++++++++++++----------
 1 file changed, 22 insertions(+), 10 deletions(-)

(limited to 'themes')

diff --git a/themes/admin_default/views/pager.html.php b/themes/admin_default/views/pager.html.php
index 505e8cf0..8df1b030 100644
--- a/themes/admin_default/views/pager.html.php
+++ b/themes/admin_default/views/pager.html.php
@@ -1,30 +1,42 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <? // See http://docs.kohanaphp.com/libraries/pagination ?>
-<ul id="gPager">
+<ul class="gPager">
   <? /* XXX: This message isn't easily localizable */
      $from_to_msg = t("Items %from_number - %to_number of %total",
                       array("from_number" => $current_first_item,
                             "to_number" => $current_last_item,
                             "total" => $total_items)) ?>
-  <li><?= $from_to_msg ?></li>
+  <li>
   <? if ($first_page): ?>
-  <li><span class="ui-icon ui-icon-seek-first"></span><a href="<?= str_replace('{page}', 1, $url) ?>"><?= t("first") ?></a></li>
+    <a href="<?= str_replace('{page}', 1, $url) ?>" class="gButtonLink ui-icon-left ui-state-default ui-corner-all">
+      <span class="ui-icon ui-icon-seek-first"></span><?= t("first") ?></a>
   <? else: ?>
-  <li class="inactive"><span class="ui-icon ui-icon-seek-first"></span><?= t("first") ?></li>
+    <a class="gButtonLink ui-icon-left ui-state-disabled ui-corner-all">
+      <span class="ui-icon ui-icon-seek-first"></span><?= t("first") ?></a>
   <? endif ?>
   <? if ($previous_page): ?>
-  <li><span class="ui-icon ui-icon-seek-prev"></span><a href="<?= str_replace('{page}', $previous_page, $url) ?>"><?= t("previous") ?></a></li>
+    <a href="<?= str_replace('{page}', $previous_page, $url) ?>" class="gButtonLink ui-icon-left ui-state-default ui-corner-all">
+      <span class="ui-icon ui-icon-seek-prev"></span><?= t("previous") ?></a>
   <? else: ?>
-  <li class="inactive"><span class="ui-icon ui-icon-seek-prev"></span><?= t("previous") ?></li>
+    <a class="gButtonLink ui-icon-left ui-state-disabled ui-corner-all">
+      <span class="ui-icon ui-icon-seek-prev"></span><?= t("previous") ?></a>
   <? endif ?>
+  </li>
+  <li class="gInfo"><?= $from_to_msg ?></li>
+  <li class="txtright">
   <? if ($next_page): ?>
-  <li><a href="<?= str_replace('{page}', $next_page, $url) ?>"><?= t("next") ?></a><span class="ui-icon ui-icon-seek-next"></span></li>
+    <a href="<?= str_replace('{page}', $next_page, $url) ?>" class="gButtonLink ui-icon-right ui-state-default ui-corner-all">
+      <span class="ui-icon ui-icon-seek-next"></span><?= t("next") ?></a>
   <? else: ?>
-  <li class="inactive"><?= t("next") ?><span class="ui-icon ui-icon-seek-next"></span></li>
+    <a class="gButtonLink ui-state-disabled ui-icon-right ui-corner-all">
+      <span class="ui-icon ui-icon-seek-next"></span><?= t("next") ?></a>
   <? endif ?>
   <? if ($last_page): ?>
-  <li><a href="<?= str_replace('{page}', $last_page, $url) ?>"><?= t("last") ?></a><span class="ui-icon ui-icon-seek-end"></span></li>
+    <a href="<?= str_replace('{page}', $last_page, $url) ?>" class="gButtonLink ui-icon-right ui-state-default ui-corner-all">
+      <span class="ui-icon ui-icon-seek-end"></span><?= t("last") ?></a>
   <? else: ?>
-  <li class="inactive"><?= t("last") ?><span class="ui-icon ui-icon-seek-end"></span></li>
+    <a class="gButtonLink ui-state-disabled ui-icon-right ui-corner-all">
+      <span class="ui-icon ui-icon-seek-end"></span><?= t("last") ?></a>
   <? endif ?>
+  </li>
 </ul>
-- 
cgit v1.2.3


From 1dccc0286f3d983352e21f8148fdf4d9e9bc205d Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Tue, 16 Jun 2009 22:09:02 -0700
Subject: Change the page.html file so that if the type of page is login, the
 sidebar contents are are not shown

---
 modules/gallery/controllers/albums.php | 2 +-
 themes/default/views/page.html.php     | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'themes')

diff --git a/modules/gallery/controllers/albums.php b/modules/gallery/controllers/albums.php
index 856709c2..17fdec6b 100644
--- a/modules/gallery/controllers/albums.php
+++ b/modules/gallery/controllers/albums.php
@@ -26,7 +26,7 @@ class Albums_Controller extends Items_Controller {
     $page_size = module::get_var("gallery", "page_size", 9);
     if (!access::can("view", $album)) {
       if ($album->id == 1) {
-        $view = new Theme_View("page.html", "page");
+        $view = new Theme_View("page.html", "login");
         $view->page_title = t("Log in to Gallery");
         $view->content = user::get_login_form("login/auth_html");
         print $view;
diff --git a/themes/default/views/page.html.php b/themes/default/views/page.html.php
index 3feb14cb..f6286f95 100644
--- a/themes/default/views/page.html.php
+++ b/themes/default/views/page.html.php
@@ -81,7 +81,9 @@
           </div>
         </div>
         <div id="gSidebar" class="yui-b">
+          <? if ($theme->page_type != "login"): ?>
           <?= $theme->display("sidebar.html") ?>
+          <? endif ?>
         </div>
       </div>
       <div id="gFooter">
-- 
cgit v1.2.3


From d54afb71d42da1b2a3c289a3a95dfa672a172607 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Fri, 19 Jun 2009 10:14:27 -0700
Subject: Fix a javascript error that was breaking IE, and localize
 ADD_A_COMMENT otherwise ui.init.js bombs.

---
 themes/default/views/movie.html.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'themes')

diff --git a/themes/default/views/movie.html.php b/themes/default/views/movie.html.php
index 0cdf63fa..e8559697 100644
--- a/themes/default/views/movie.html.php
+++ b/themes/default/views/movie.html.php
@@ -25,7 +25,7 @@
         },
         controls: {
           autoHide: 'always',
-          hideDelay: 2000,
+          hideDelay: 2000
         }
       }
     })
@@ -36,5 +36,8 @@
     <div><?= p::clean($item->description) ?></div>
   </div>
 
+  <script type="text/javascript">
+    var ADD_A_COMMENT = "<?= t("Add a comment") ?>";
+  </script>
   <?= $theme->photo_bottom() ?>
 </div>
-- 
cgit v1.2.3


From b3226d7cbb4c9dbd2d6244d527cc7c4398489f47 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Fri, 19 Jun 2009 13:25:42 -0700
Subject: Improve the task dialog 1) Put a "starting up..." message before
 there's any feedback from the server 2) show the title of the task in the
 dialog.

---
 modules/gallery/views/admin_maintenance_task.html.php | 5 ++++-
 themes/default/css/screen.css                         | 4 ++++
 2 files changed, 8 insertions(+), 1 deletion(-)

(limited to 'themes')

diff --git a/modules/gallery/views/admin_maintenance_task.html.php b/modules/gallery/views/admin_maintenance_task.html.php
index 1ee02311..d9aecc60 100644
--- a/modules/gallery/views/admin_maintenance_task.html.php
+++ b/modules/gallery/views/admin_maintenance_task.html.php
@@ -23,8 +23,11 @@
   }
 </script>
 <div id="gProgress">
+  <h1> <?= $task->name ?> </h1>
   <div class="gProgressBar"></div>
-  <div id="gStatus"></div>
+  <div id="gStatus">
+    <?= t("Starting up...") ?>
+  </div>
   <div>
     <button id="gPauseButton" class="ui-state-default ui-corner-all" onclick="dismiss()"><?= t("Pause") ?></button>
     <button id="gDoneButton" class="ui-state-default ui-corner-all" style="display: none" onclick="dismiss()"><?= t("Done") ?></button>
diff --git a/themes/default/css/screen.css b/themes/default/css/screen.css
index 03c13cc1..68f12ff1 100644
--- a/themes/default/css/screen.css
+++ b/themes/default/css/screen.css
@@ -1000,6 +1000,10 @@ form .gError,
 
 
 /*************** STUFF THAT NEEDS A HOME ****************/
+#gProgress h1 {
+ font-size: 1.1em;
+}
+
 .gProgressBar {
   height: 1em;
   width: 100%;
-- 
cgit v1.2.3


From c2faf5f8c811cdab334548289a5f35c1f4e7c8bf Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Fri, 19 Jun 2009 13:35:53 -0700
Subject: Move 'Permissions' above 'STUFF THAT NEEDS A HOME' since I think that
 the stuff that needs a home is a catch all and should be at the bottom.

---
 themes/default/css/screen.css | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'themes')

diff --git a/themes/default/css/screen.css b/themes/default/css/screen.css
index 68f12ff1..e97c95d5 100644
--- a/themes/default/css/screen.css
+++ b/themes/default/css/screen.css
@@ -999,6 +999,19 @@ form .gError,
 }
 
 
+/* Permissions ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#gPermissions .gDenied, #gPermissions .gAllowed {
+  text-align: center;
+  vertical-align: middle;
+}
+#gPermissions .gDenied {
+  background-color: #fcc;
+}
+#gPermissions .gAllowed {
+  background-color: #cfc;
+}
+
 /*************** STUFF THAT NEEDS A HOME ****************/
 #gProgress h1 {
  font-size: 1.1em;
@@ -1058,16 +1071,3 @@ form .gError,
   background-color: #cfc;
   border: 1px solid #beb;
 }
-
-/* Permissions ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-#gPermissions .gDenied, #gPermissions .gAllowed {
-  text-align: center;
-  vertical-align: middle;
-}
-#gPermissions .gDenied {
-  background-color: #fcc;
-}
-#gPermissions .gAllowed {
-  background-color: #cfc;
-}
-- 
cgit v1.2.3


From feab9cfc34d96637243eeefe22c886054caf4a9d Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Fri, 19 Jun 2009 13:47:38 -0700
Subject: Give the admin/g2_import page a facelift.

---
 modules/g2_import/views/admin_g2_import.html.php | 114 +++++++++++++----------
 themes/default/css/screen.css                    |  29 ++++++
 2 files changed, 95 insertions(+), 48 deletions(-)

(limited to 'themes')

diff --git a/modules/g2_import/views/admin_g2_import.html.php b/modules/g2_import/views/admin_g2_import.html.php
index d5e29e12..0c742962 100644
--- a/modules/g2_import/views/admin_g2_import.html.php
+++ b/modules/g2_import/views/admin_g2_import.html.php
@@ -1,74 +1,92 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
-<div id="gAdminG2Config">
+<div id="gAdminG2Import">
   <h1> <?= t("Gallery 2 Import") ?> </h1>
   <p>
     <?= t("Import your Gallery 2 users, photos, movies, comments and tags into your new Gallery 3 installation.") ?>
-    <br/>
-    <?= t("<b>Note</b>: The importer is a work in progress and does not currently support permissions, and movie formats other than Flash video and MP4") ?>
-    <br/>
-    <?= t("<b>Note</b>: The importer has <i>known issues</i> with the eAccelerator PHP accelerator.  If you're using eAccelerator, please disable it.  One way to do that is to put <code>php_value eaccelerator.enable 0</code> in gallery3/.htaccess") ?>
   </p>
-  <?= $form ?>
-</div>
-
-<? if (g2_import::is_initialized()): ?>
-<div id="gAdminG2Import">
-  <h1> <?= t("Import") ?> </h1>
-  <ul id="gMessage">
-    <li class="gSuccess">
-      <?= t("Gallery version %version detected", array("version" => g2_import::version())) ?>
-    </li>
-  </ul>
 
-  <div class="gInfo">
+  <div id="gAdminG2ImportNotes">
+    <h2> <?= t("Notes") ?> </h2>
     <p>
-      <?= t("Your Gallery 2 has the following importable data in it") ?>
+      <?= t("The import process is a work in progress with some known issues:") ?>
     </p>
     <ul>
       <li>
-        <?= t2("1 user", "%count users", $g2_stats["users"]) ?>
+        <?= t("Permissions are <b>not imported</b>.  You will have to set them again manually (for now).") ?>
       </li>
       <li>
-        <?= t2("1 group", "%count groups", $g2_stats["groups"]) ?>
+        <?= t("The only supported image formats are JPG, PNG and GIF.  Other formats will be skipped.") ?>
       </li>
       <li>
-        <?= t2("1 album", "%count albums", $g2_stats["albums"]) ?>
+        <?= t("The only supported movie formats are FLV and MP4.  Other formats will be skipped.") ?>
       </li>
       <li>
-        <?= t2("1 photo", "%count photos", $g2_stats["photos"]) ?>
+        <?= t("The eAccelerator PHP performance extension is known to cause issues.  If you're using eAccelerator and having problems, please disable it while you do your import.  One way to do that is to put <code>php_value eaccelerator.enable 0</code> in gallery3/.htaccess") ?>
       </li>
-      <li>
-        <?= t2("1 movie", "%count movies", $g2_stats["movies"]) ?>
+    </ul>
+  </div>
+  <?= $form ?>
+
+  <? if (g2_import::is_initialized()): ?>
+  <div id="gAdminG2ImportDetails">
+    <h2> <?= t("Import") ?> </h2>
+    <ul id="gMessage">
+      <li class="gSuccess">
+        <?= t("Gallery version %version detected", array("version" => g2_import::version())) ?>
       </li>
-      <li>
-        <?= t2("1 comment", "%count comments", $g2_stats["comments"]) ?>
+      <? if ($g2_sizes["thumb"]["size"] && $thumb_size != $g2_sizes["thumb"]["size"]): ?>
+      <li class="gWarning">
+        <?= t("Your most common thumbnail size in Gallery 2 is %g2_pixels pixels, but your Gallery 3 thumbnail size is set to %g3_pixels pixels. <a href=\"%url\">Using the same value</a> will speed up your import.",
+            array("g2_pixels" => $g2_sizes["thumb"]["size"],
+        "g3_pixels" => $thumb_size,
+        "url" => url::site("admin/theme_options"))) ?>
       </li>
-      <li>
-        <?= t2("1 tagged photo/movie/album",
-               "%count tagged photos/movies/albums", $g2_stats["tags"]) ?>
+      <? endif ?>
+
+      <? if ($g2_sizes["resize"]["size"] && $resize_size != $g2_sizes["resize"]["size"]): ?>
+      <li class="gWarning">
+        <?= t("Your most common intermediate size in Gallery 2 is %g2_pixels pixels, but your Gallery 3 thumbnail size is set to %g3_pixels pixels. <a href=\"%url\">Using the same value</a> will speed up your import.",
+            array("g2_pixels" => $g2_sizes["resize"]["size"],
+        "g3_pixels" => $resize_size,
+        "url" => url::site("admin/theme_options"))) ?>
       </li>
+      <? endif ?>
     </ul>
-  </div>
 
-  <? if ($g2_sizes["thumb"]["size"] && $thumb_size != $g2_sizes["thumb"]["size"]): ?>
-  <div class="gWarning">
-    <?= t("Your most common thumbnail size in Gallery 2 is %g2_pixels pixels, but your Gallery 3 thumbnail size is set to %g3_pixels pixels. <a href=\"%url\">Using the same value</a> will speed up your import.",
-        array("g2_pixels" => $g2_sizes["thumb"]["size"],
-              "g3_pixels" => $thumb_size,
-              "url" => url::site("admin/theme_options"))) ?>
-  </div>
-  <? endif ?>
+    <div class="gInfo">
+      <p>
+        <?= t("Your Gallery 2 has the following importable data in it") ?>
+      </p>
+      <ul>
+        <li>
+          <?= t2("1 user", "%count users", $g2_stats["users"]) ?>
+        </li>
+        <li>
+          <?= t2("1 group", "%count groups", $g2_stats["groups"]) ?>
+        </li>
+        <li>
+          <?= t2("1 album", "%count albums", $g2_stats["albums"]) ?>
+        </li>
+        <li>
+          <?= t2("1 photo", "%count photos", $g2_stats["photos"]) ?>
+        </li>
+        <li>
+          <?= t2("1 movie", "%count movies", $g2_stats["movies"]) ?>
+        </li>
+        <li>
+          <?= t2("1 comment", "%count comments", $g2_stats["comments"]) ?>
+        </li>
+        <li>
+          <?= t2("1 tagged photo/movie/album",
+              "%count tagged photos/movies/albums", $g2_stats["tags"]) ?>
+        </li>
+      </ul>
+    </div>
 
-  <? if ($g2_sizes["resize"]["size"] && $resize_size != $g2_sizes["resize"]["size"]): ?>
-  <div class="gWarning">
-    <?= t("Your most common intermediate size in Gallery 2 is %g2_pixels pixels, but your Gallery 3 thumbnail size is set to %g3_pixels pixels. <a href=\"%url\">Using the same value</a> will speed up your import.",
-        array("g2_pixels" => $g2_sizes["resize"]["size"],
-              "g3_pixels" => $resize_size,
-              "url" => url::site("admin/theme_options"))) ?>
+    <a class="gDialogLink"
+       href="<?= url::site("admin/maintenance/start/g2_import_task::import?csrf=$csrf") ?>">
+      <?= t("Start importing!") ?>
+    </a>
   </div>
   <? endif ?>
-
-  <?= t("You can begin your import on the <a href=\"%url\">maintenance page</a>",
-        array("url" => url::site("admin/maintenance"))) ?>
 </div>
-<? endif ?>
diff --git a/themes/default/css/screen.css b/themes/default/css/screen.css
index e97c95d5..521f3915 100644
--- a/themes/default/css/screen.css
+++ b/themes/default/css/screen.css
@@ -1012,6 +1012,7 @@ form .gError,
   background-color: #cfc;
 }
 
+
 /*************** STUFF THAT NEEDS A HOME ****************/
 #gProgress h1 {
  font-size: 1.1em;
@@ -1071,3 +1072,31 @@ form .gError,
   background-color: #cfc;
   border: 1px solid #beb;
 }
+
+#gAdminG2ImportNotes {
+  padding-bottom: 20px;
+}
+
+#gAdminG2ImportDetails {
+  padding-top: 20px;
+}
+
+#gAdminG2ImportDetails .gWarning {
+  margin-top: 4px;
+}
+
+#gAdminG2ImportDetails .gInfo {
+  padding: 2px;
+  border: 1px solid #999;
+}
+
+#gAdminG2ImportNotes p {
+  padding: 0px;
+  margin: 0px;
+}
+
+#gAdminG2ImportNotes ul li {
+  padding-left: 0px;
+  margin-left: 20px;
+  list-style-type: circle;
+}
-- 
cgit v1.2.3


From b72d0db7bee59d04dfc5036b35586210e81718e6 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Fri, 19 Jun 2009 15:56:55 -0700
Subject: More minor facelift for the admin/g2_import page.

---
 modules/g2_import/views/admin_g2_import.html.php | 10 ++++++----
 themes/default/css/screen.css                    |  7 ++++---
 2 files changed, 10 insertions(+), 7 deletions(-)

(limited to 'themes')

diff --git a/modules/g2_import/views/admin_g2_import.html.php b/modules/g2_import/views/admin_g2_import.html.php
index 0c742962..da2bb5d1 100644
--- a/modules/g2_import/views/admin_g2_import.html.php
+++ b/modules/g2_import/views/admin_g2_import.html.php
@@ -83,10 +83,12 @@
       </ul>
     </div>
 
-    <a class="gDialogLink"
-       href="<?= url::site("admin/maintenance/start/g2_import_task::import?csrf=$csrf") ?>">
-      <?= t("Start importing!") ?>
-    </a>
+    <p>
+      <a class="gButtonLink gDialogLink ui-state-default ui-corner-all"
+         href="<?= url::site("admin/maintenance/start/g2_import_task::import?csrf=$csrf") ?>">
+        <?= t("Begin import!") ?>
+      </a>
+    </p>
   </div>
   <? endif ?>
 </div>
diff --git a/themes/default/css/screen.css b/themes/default/css/screen.css
index 521f3915..b6d5bdb9 100644
--- a/themes/default/css/screen.css
+++ b/themes/default/css/screen.css
@@ -1088,15 +1088,16 @@ form .gError,
 #gAdminG2ImportDetails .gInfo {
   padding: 2px;
   border: 1px solid #999;
+  margin-bottom: 10px;
 }
 
-#gAdminG2ImportNotes p {
+#gAdminG2ImportNotes p, #gAdminG2ImportDetails .gInfo p {
   padding: 0px;
   margin: 0px;
 }
 
-#gAdminG2ImportNotes ul li {
+#gAdminG2ImportNotes ul li, #gAdminG2Import .gInfo ul li {
   padding-left: 0px;
   margin-left: 20px;
-  list-style-type: circle;
+  list-style-type: disc;
 }
-- 
cgit v1.2.3


From 49975f10b9982d95b36681be536f3f70fa46dbf4 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 21 Jun 2009 15:15:07 -0700
Subject: Add width/height to the logo <img>

---
 themes/default/views/header.html.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'themes')

diff --git a/themes/default/views/header.html.php b/themes/default/views/header.html.php
index 1e70b7ac..e1e52bda 100644
--- a/themes/default/views/header.html.php
+++ b/themes/default/views/header.html.php
@@ -4,7 +4,7 @@
 <?= $header_text ?>
 <? else: ?>
 <a href="<?= url::site("albums/1") ?>">
-  <img id="gLogo" alt="<?= t("Gallery: Your photos on your web site") ?>" src="<?= $theme->url("images/logo.png") ?>" />
+  <img width="107" height="48" id="gLogo" alt="<?= t("Gallery: Your photos on your web site") ?>" src="<?= $theme->url("images/logo.png") ?>" />
 </a>
 <? endif ?>
 
-- 
cgit v1.2.3


From 9bdeb726acf4eaaa26e5a90672c8646361fcef9c Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Mon, 22 Jun 2009 13:25:55 -0700
Subject: Fix indentation

---
 themes/default/css/screen.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'themes')

diff --git a/themes/default/css/screen.css b/themes/default/css/screen.css
index b6d5bdb9..b6e2e1b8 100644
--- a/themes/default/css/screen.css
+++ b/themes/default/css/screen.css
@@ -414,7 +414,7 @@ form .gError,
 /* Layout containers ~~~~~~~~~~~~~~~~~~~~~ */
 
 #gHeader {
-	background-color: #e8e8e8;
+  background-color: #e8e8e8;
   border-bottom: 1px solid #fff;
   font-size: .8em;
   margin-bottom: 1em;
@@ -435,7 +435,7 @@ form .gError,
 }
 
 #gFooter {
-	background-color: #e8e8e8;
+  background-color: #e8e8e8;
   border-top: 1px solid #ccc;
   font-size: .8em;
   margin-top: 20px;
-- 
cgit v1.2.3


From ec61cd5031c01028dee3435d6b25430ab068ec01 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Mon, 22 Jun 2009 14:20:28 -0700
Subject: Fix css indentation

---
 modules/gallery/css/l10n_client.css | 226 ++++++++++++++++++------------------
 modules/gallery/css/upgrader.css    |  98 ++++++++--------
 modules/organize/css/organize.css   |   2 +-
 themes/admin_default/css/screen.css |  10 +-
 themes/default/css/screen.css       |  20 ++--
 5 files changed, 178 insertions(+), 178 deletions(-)

(limited to 'themes')

diff --git a/modules/gallery/css/l10n_client.css b/modules/gallery/css/l10n_client.css
index bab1d0ed..ecec859d 100644
--- a/modules/gallery/css/l10n_client.css
+++ b/modules/gallery/css/l10n_client.css
@@ -5,8 +5,8 @@
 /* $Id: l10n_client.css,v 1.6 2008/09/09 10:48:20 goba Exp $ */
 
 /* width percentages add to 99% rather than 100% to prevent float
-overflows from occurring in an unnamed browser that can't decide
-how it wants to round. */
+   overflows from occurring in an unnamed browser that can't decide
+   how it wants to round. */
 
 /* l10n_client container */
 #l10n-client {
@@ -19,8 +19,8 @@ how it wants to round. */
   bottom:0px; left:0px;
   overflow:hidden;}
 
-  * html #l10n-client {
-    position:static;}
+* html #l10n-client {
+  position:static;}
 
 #l10n-client-string-select .string-list,
 #l10n-client-string-editor .source,
@@ -34,38 +34,38 @@ how it wants to round. */
   color:#fff;
   background:#37a;}
 
-  #l10n-client .labels .label {
-    display:none;}
+#l10n-client .labels .label {
+  display:none;}
 
-  /* Panel toggle button (span) */
-  #l10n-client .labels .toggle {
-    cursor:pointer;
-    display:block;
-    position:absolute; right:0em;
-    padding: 0em .75em; height:2em; line-height:2em;
-    text-transform:uppercase;
-    text-align:center; background:#000;}
+/* Panel toggle button (span) */
+#l10n-client .labels .toggle {
+  cursor:pointer;
+  display:block;
+  position:absolute; right:0em;
+  padding: 0em .75em; height:2em; line-height:2em;
+  text-transform:uppercase;
+  text-align:center; background:#000;}
 
-  /* Panel labels */
-  #l10n-client h2 {
-    border-left:1px solid #fff;
-    height:1em; line-height:1em;
-    padding: .5em; margin:0px;
-    font-size:1em;
-    text-transform:uppercase;}
+/* Panel labels */
+#l10n-client h2 {
+  border-left:1px solid #fff;
+  height:1em; line-height:1em;
+  padding: .5em; margin:0px;
+  font-size:1em;
+  text-transform:uppercase;}
 
-    #l10n-client .strings h2 {
-      border:0px;}
+#l10n-client .strings h2 {
+  border:0px;}
 
-  /* 25 + 37 + 37 = 99 */
-  #l10n-client .strings {
-    width:25%; float:left;}
+/* 25 + 37 + 37 = 99 */
+#l10n-client .strings {
+  width:25%; float:left;}
 
-  #l10n-client .source {
-    width:37%; float:left;}
+#l10n-client .source {
+  width:37%; float:left;}
 
-  #l10n-client .translation {
-    width:37%; float:left;}
+#l10n-client .translation {
+  width:37%; float:left;}
 
 /* Translatable string list */
 #l10n-client-string-select {
@@ -75,77 +75,77 @@ how it wants to round. */
   direction: ltr;
 }
 
-  #l10n-client .string-list {
-    height:17em;
-    overflow:auto;
-    list-style:none; list-style-image:none;
-    margin:0em; padding:0em;}
-
-  #l10n-client .string-list li {
-    font-size:.9em;
-    line-height:1.5em;
-    cursor:default;
-    background:transparent;
-    list-style:none; list-style-image:none;
-    border-bottom:1px solid #ddd;
-    padding:.25em .5em;
-    margin:0em;}
-
-  /* Green for translated */
-  #l10n-client .string-list li.translated {
-    border-bottom-color:#9c3;
-    background:#cf6; color:#360;}
-
-    #l10n-client .string-list li.translated:hover {
-      background: #df8;}
-
-    #l10n-client .string-list li.translated:active {
-      background: #9c3;}
-
-  #l10n-client .string-list li.hidden {
-    display:none;}
-
-  /* Gray + Blue hover for untranslated */
-  #l10n-client .string-list li.untranslated {}
-
-    #l10n-client .string-list li.untranslated:hover {
-      background: #ace;}
-
-    #l10n-client .string-list li.untranslated:active {
-      background: #8ac;}
-
-  /* Selected string is indicated by bold text */
-  #l10n-client .string-list li.active {
-    font-weight:bold;}
-
-  #l10n-client #gL10nSearchForm {
-    background:#eee;
-    text-align:center;
-    height:2em; line-height:2em;
-    margin:0em; padding:.5em .5em;
-  }
-
-  #l10n-client #gL10nSearchForm .form-item,
-  #l10n-client #gL10nSearchForm input.form-text,
-  #l10n-client #gL10nSearchForm #search-filter-go,
-  #l10n-client #gL10nSearchForm #search-filter-clear {
-    display:inline;
-    vertical-align:middle;
-  }
-
-    #l10n-client #gL10nSearchForm .form-item {
-      margin:0em;
-      padding:0em;
-    }
-
-    #l10n-client #gL10nSearchForm input.form-text {
-      width:80%;
-    }
-
-    #l10n-client #gL10nSearchForm #search-filter-clear {
-      width:10%;
-      margin:0em;
-    }
+#l10n-client .string-list {
+  height:17em;
+  overflow:auto;
+  list-style:none; list-style-image:none;
+  margin:0em; padding:0em;}
+
+#l10n-client .string-list li {
+  font-size:.9em;
+  line-height:1.5em;
+  cursor:default;
+  background:transparent;
+  list-style:none; list-style-image:none;
+  border-bottom:1px solid #ddd;
+  padding:.25em .5em;
+  margin:0em;}
+
+/* Green for translated */
+#l10n-client .string-list li.translated {
+  border-bottom-color:#9c3;
+  background:#cf6; color:#360;}
+
+#l10n-client .string-list li.translated:hover {
+  background: #df8;}
+
+#l10n-client .string-list li.translated:active {
+  background: #9c3;}
+
+#l10n-client .string-list li.hidden {
+  display:none;}
+
+/* Gray + Blue hover for untranslated */
+#l10n-client .string-list li.untranslated {}
+
+#l10n-client .string-list li.untranslated:hover {
+  background: #ace;}
+
+#l10n-client .string-list li.untranslated:active {
+  background: #8ac;}
+
+/* Selected string is indicated by bold text */
+#l10n-client .string-list li.active {
+  font-weight:bold;}
+
+#l10n-client #gL10nSearchForm {
+  background:#eee;
+  text-align:center;
+  height:2em; line-height:2em;
+  margin:0em; padding:.5em .5em;
+}
+
+#l10n-client #gL10nSearchForm .form-item,
+#l10n-client #gL10nSearchForm input.form-text,
+#l10n-client #gL10nSearchForm #search-filter-go,
+#l10n-client #gL10nSearchForm #search-filter-clear {
+  display:inline;
+  vertical-align:middle;
+}
+
+#l10n-client #gL10nSearchForm .form-item {
+  margin:0em;
+  padding:0em;
+}
+
+#l10n-client #gL10nSearchForm input.form-text {
+  width:80%;
+}
+
+#l10n-client #gL10nSearchForm #search-filter-clear {
+  width:10%;
+  margin:0em;
+}
 
 #l10n-client-string-editor {
   display:none;
@@ -153,22 +153,22 @@ how it wants to round. */
   width:74%;}
 
 #l10n-client-string-editor .source {
-    overflow:hidden;
-    width:50%; float:left;}
+  overflow:hidden;
+  width:50%; float:left;}
 
 #l10n-client-string-editor .source .source-text {
-      line-height:1.5em;
-      background:#eee;
-      font-family: monospace;
-      text-align: left;
-      height:16em; margin:1em; padding:1em;
-      overflow:auto;
-      direction: ltr;
+  line-height:1.5em;
+  background:#eee;
+  font-family: monospace;
+  text-align: left;
+  height:16em; margin:1em; padding:1em;
+  overflow:auto;
+  direction: ltr;
 }
 
-  #l10n-client-string-editor .translation {
-    overflow:hidden;
-    width:49%; float:right;}
+#l10n-client-string-editor .translation {
+  overflow:hidden;
+  width:49%; float:right;}
 
 #gL10nClientSaveForm {
   padding:0em;}
diff --git a/modules/gallery/css/upgrader.css b/modules/gallery/css/upgrader.css
index 6bd16064..b877df49 100644
--- a/modules/gallery/css/upgrader.css
+++ b/modules/gallery/css/upgrader.css
@@ -1,117 +1,117 @@
 body {
-    background: #eee;
-    font-family: Trebuchet MS;
-    font-size: 1.1em;
+  background: #eee;
+  font-family: Trebuchet MS;
+  font-size: 1.1em;
 }
 
 h1 {
-    font-size: 1.4em;
+  font-size: 1.4em;
 }
 
 div#outer {
-    width: 650px;
-    background: white;
-    border: 1px solid #999;
-    margin: 0 auto;
-    padding: -10px;
+  width: 650px;
+  background: white;
+  border: 1px solid #999;
+  margin: 0 auto;
+  padding: -10px;
 }
 
 div#inner {
-    padding: 0 1em 0 1em;
-    margin: 0px;
+  padding: 0 1em 0 1em;
+  margin: 0px;
 }
 
 div#footer {
-    border-top: 1px solid #ccc;
-    margin: 1em;
+  border-top: 1px solid #ccc;
+  margin: 1em;
 }
 
 td.name {
-    text-align: left;
-    padding-left: 30px;
+  text-align: left;
+  padding-left: 30px;
 }
 
 td {
-    text-align: center;
-    border-bottom: 1px solid #eee;
+  text-align: center;
+  border-bottom: 1px solid #eee;
 }
 
 tr.current td {
-    color: #999;
-    font-style: italic;
+  color: #999;
+  font-style: italic;
 }
 
 tr.current td.gallery {
-    color: #00d;
+  color: #00d;
 }
 
 tr.upgradeable td {
-    font-weight: bold;
+  font-weight: bold;
 }
 
 tr.upgradeable td.gallery {
-    color: #00d;
+  color: #00d;
 }
 
 table {
-    width: 600px;
-    margin-bottom: 10px;
+  width: 600px;
+  margin-bottom: 10px;
 }
 
 p {
-    font-size: .9em;
+  font-size: .9em;
 }
 
 ul {
-    font-size: .9em;
-    list-style: none;
+  font-size: .9em;
+  list-style: none;
 }
 
 li {
-    display: inline;
+  display: inline;
 }
 
 li:before {
-    content: "\00BB \0020";
+  content: "\00BB \0020";
 }
 
 div.button {
-    margin: 0 auto;
-    width: 120px;
-    text-align: center;
-    border: 1px solid #999;
-    background: #eee;
+  margin: 0 auto;
+  width: 120px;
+  text-align: center;
+  border: 1px solid #999;
+  background: #eee;
 }
 
 div.button a {
-    text-decoration: none;
+  text-decoration: none;
 }
 
 div.button:hover {
-    background: #ccc;
+  background: #ccc;
 }
 
 div#confirmation {
-    position: absolute;
-    background: blue;
-    z-index: 1000;
-    margin: 10px;
-    text-align: center;
+  position: absolute;
+  background: blue;
+  z-index: 1000;
+  margin: 10px;
+  text-align: center;
 }
 
 div#confirmation div {
-    margin: 2px;
-    padding: 20px;
-    border: 2px solid #999;
-    background: #eee;
+  margin: 2px;
+  padding: 20px;
+  border: 2px solid #999;
+  background: #eee;
 }
 
 .gray_on_done {
-    opacity: <?= $done ? "0.5" : "1" ?>;
+  opacity: <?= $done ? "0.5" : "1" ?>;
 }
 
 pre {
-    display: inline;
-    margin: 0px;
-    padding: 0px;
+  display: inline;
+  margin: 0px;
+  padding: 0px;
 }
diff --git a/modules/organize/css/organize.css b/modules/organize/css/organize.css
index 0fdf5aef..1e608beb 100644
--- a/modules/organize/css/organize.css
+++ b/modules/organize/css/organize.css
@@ -222,7 +222,7 @@
 #gOrganizeEditForm {
   float: right;
   width: 79%;
-//  height: 100px;
+  //  height: 100px;
 }
 
 #gOrganizeFormThumbs {
diff --git a/themes/admin_default/css/screen.css b/themes/admin_default/css/screen.css
index de4d2413..862f1fc1 100644
--- a/themes/admin_default/css/screen.css
+++ b/themes/admin_default/css/screen.css
@@ -77,14 +77,14 @@
  **********************************************************************/
 
 .gView {
-	min-width: 974px !important;
+  min-width: 974px !important;
 }
 
 #gHeader {
-	background-color: #e8e8e8;
-	border-bottom: 1px solid #ccc;
+  background-color: #e8e8e8;
+  border-bottom: 1px solid #ccc;
   margin-bottom: 20px;
-	padding: 0 20px;
+  padding: 0 20px;
 }
 
 #gContent {
@@ -171,7 +171,7 @@
 }
 
 #gSiteStatus {
-	margin-bottom: 0;
+  margin-bottom: 0;
 }
 
 #gContent .gItem {
diff --git a/themes/default/css/screen.css b/themes/default/css/screen.css
index b6e2e1b8..a450356c 100644
--- a/themes/default/css/screen.css
+++ b/themes/default/css/screen.css
@@ -330,7 +330,7 @@ form p.gError,
 }
 
 form .gError {
-	color: #f00;
+  color: #f00;
 }
 
 #gSiteStatus .gError,
@@ -368,7 +368,7 @@ form p.gError {
 
 form .gError,
 .gPager .gInfo {
-	background-color: #fff;
+  background-color: #fff;
 }
 
 #gAdminMaintenance .gError,
@@ -700,7 +700,7 @@ form .gError,
 }
 
 #gAddPhotos .gBreadcrumbs {
-	font-size: .9em;
+  font-size: .9em;
 }
 
 /* Tags and cloud ~~~~~~~~~~~~~~~~~~~~~~~~ */
@@ -833,14 +833,14 @@ form .gError,
 }
 
 .gDraggable {
-	cursor: move;
+  cursor: move;
 }
 
 .gDropTarget {
-	background-color: #cfdeff;
-	border: 1px dotted #999;
-	height: 100px;
-	margin: 1em 0;
+  background-color: #cfdeff;
+  border: 1px dotted #999;
+  height: 100px;
+  margin: 1em 0;
 }
 
 /* jQuery UI Dialog ~~~~~~~~~~~~~~~~~~~~~~ */
@@ -864,7 +864,7 @@ form .gError,
 }
 
 #gDialog li {
-	padding-left: 0;
+  padding-left: 0;
 }
 
 #gDialog form input[type="text"],
@@ -1015,7 +1015,7 @@ form .gError,
 
 /*************** STUFF THAT NEEDS A HOME ****************/
 #gProgress h1 {
- font-size: 1.1em;
+  font-size: 1.1em;
 }
 
 .gProgressBar {
-- 
cgit v1.2.3


From 65a7967a046c22abadfd526954a2cd0002ea26cf Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Tue, 23 Jun 2009 12:17:37 +0800
Subject: Remove unsued <span> element

Signed-off-by: Tim Almdal <tnalmdal@shaw.ca>
---
 themes/default/views/album.html.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'themes')

diff --git a/themes/default/views/album.html.php b/themes/default/views/album.html.php
index 7e6913df..799d94c1 100644
--- a/themes/default/views/album.html.php
+++ b/themes/default/views/album.html.php
@@ -19,7 +19,7 @@
       <?= $child->thumb_img(array("class" => "gThumbnail")) ?>
     </a>
     <?= $theme->thumb_bottom($child) ?>
-    <h2><span></span><a href="<?= $child->url() ?>"><?= p::clean($child->title) ?></a></h2>
+    <h2><a href="<?= $child->url() ?>"><?= p::clean($child->title) ?></a></h2>
     <ul class="gMetadata">
       <?= $theme->thumb_info($child) ?>
     </ul>
-- 
cgit v1.2.3


From 107431f2465e2ce0ddea14af70d1ee329d1d1990 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Tue, 23 Jun 2009 13:51:41 -0700
Subject: Revert "Remove unsued <span> element"

This reverts commit 65a7967a046c22abadfd526954a2cd0002ea26cf.

Turns out, the span really is in use.
---
 themes/default/views/album.html.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'themes')

diff --git a/themes/default/views/album.html.php b/themes/default/views/album.html.php
index 799d94c1..7e6913df 100644
--- a/themes/default/views/album.html.php
+++ b/themes/default/views/album.html.php
@@ -19,7 +19,7 @@
       <?= $child->thumb_img(array("class" => "gThumbnail")) ?>
     </a>
     <?= $theme->thumb_bottom($child) ?>
-    <h2><a href="<?= $child->url() ?>"><?= p::clean($child->title) ?></a></h2>
+    <h2><span></span><a href="<?= $child->url() ?>"><?= p::clean($child->title) ?></a></h2>
     <ul class="gMetadata">
       <?= $theme->thumb_info($child) ?>
     </ul>
-- 
cgit v1.2.3


From b9b68e09527f2680252bcba054019c45db07829a Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Tue, 23 Jun 2009 16:05:32 -0700
Subject: Add a new "show credits" check box in the theme options so that you
 can disable any module credits if you want.  Update the theme to obey it.

---
 modules/gallery/controllers/admin_theme_options.php | 1 +
 modules/gallery/helpers/gallery_installer.php       | 8 +++++++-
 modules/gallery/helpers/theme.php                   | 2 ++
 modules/gallery/module.info                         | 2 +-
 themes/default/views/footer.html.php                | 4 +++-
 5 files changed, 14 insertions(+), 3 deletions(-)

(limited to 'themes')

diff --git a/modules/gallery/controllers/admin_theme_options.php b/modules/gallery/controllers/admin_theme_options.php
index 2716ed93..8970c3c9 100644
--- a/modules/gallery/controllers/admin_theme_options.php
+++ b/modules/gallery/controllers/admin_theme_options.php
@@ -56,6 +56,7 @@ class Admin_Theme_Options_Controller extends Admin_Controller {
 
       module::set_var("gallery", "header_text", $form->edit_theme->header_text->value);
       module::set_var("gallery", "footer_text", $form->edit_theme->footer_text->value);
+      module::set_var("gallery", "show_credits", $form->edit_theme->show_credits->value);
 
       message::success(t("Updated theme details"));
       url::redirect("admin/theme_options");
diff --git a/modules/gallery/helpers/gallery_installer.php b/modules/gallery/helpers/gallery_installer.php
index 4f6342b4..df555d52 100644
--- a/modules/gallery/helpers/gallery_installer.php
+++ b/modules/gallery/helpers/gallery_installer.php
@@ -246,9 +246,10 @@ class gallery_installer {
     module::set_var("gallery", "date_format", "Y-M-d");
     module::set_var("gallery", "date_time_format", "Y-M-d H:i:s");
     module::set_var("gallery", "time_format", "H:i:s");
+    module::set_var("gallery", "show_credits", 1);
     // @todo this string needs to be picked up by l10n_scanner
     module::set_var("gallery", "credits", "Powered by <a href=\"%url\">Gallery %version</a>");
-    module::set_version("gallery", 2);
+    module::set_version("gallery", 3);
   }
 
   static function upgrade($version) {
@@ -259,6 +260,11 @@ class gallery_installer {
       module::set_var("gallery", "version", "3.0 pre beta 2 (git)");
       module::set_version("gallery", $version = 2);
     }
+
+    if ($version == 2) {
+      module::set_var("gallery", "show_credits", 1);
+      module::set_version("gallery", $version = 3);
+    }
   }
 
   static function uninstall() {
diff --git a/modules/gallery/helpers/theme.php b/modules/gallery/helpers/theme.php
index 0a43f25c..b46a2c14 100644
--- a/modules/gallery/helpers/theme.php
+++ b/modules/gallery/helpers/theme.php
@@ -55,6 +55,8 @@ class theme_Core {
       ->value(module::get_var("gallery", "header_text"));
     $group->textarea("footer_text")->label(t("Footer text"))->id("gFooterText")
       ->value(module::get_var("gallery", "footer_text"));
+    $group->checkbox("show_credits")->label(t("Show site credits"))->id("gFooterText")
+      ->checked(module::get_var("gallery", "show_credits"));
     $group->submit("")->value(t("Save"));
     return $form;
   }
diff --git a/modules/gallery/module.info b/modules/gallery/module.info
index 3a5dd593..e5b1f809 100644
--- a/modules/gallery/module.info
+++ b/modules/gallery/module.info
@@ -1,3 +1,3 @@
 name = Gallery 3
 description = Gallery core application
-version = 2
+version = 3
diff --git a/themes/default/views/footer.html.php b/themes/default/views/footer.html.php
index d7111922..040a4062 100644
--- a/themes/default/views/footer.html.php
+++ b/themes/default/views/footer.html.php
@@ -2,7 +2,9 @@
 <?= $theme->footer() ?>
 <? if ($footer_text = module::get_var("gallery", "footer_text")): ?>
 <?= $footer_text ?>
-<? else: ?>
+<? endif ?>
+
+<? if (module::get_var("gallery", "show_credits")): ?>
 <ul id="gCredits">
   <?= $theme->credits() ?>
 </ul>
-- 
cgit v1.2.3


From 292d216f7c133152cb921db1cbc7a0c4843a977a Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Wed, 24 Jun 2009 18:02:36 -0700
Subject: Implement printing support on the photo page.  I've used an icon that
 doesn't quite match the theme temporarily.  I'm hoping to have a matching
 icon soon.

---
 modules/digibug/helpers/digibug_menu.php | 18 +++++++-----------
 modules/digibug/js/digibug.js            |  4 ++++
 themes/default/css/screen.css            |  4 ++++
 3 files changed, 15 insertions(+), 11 deletions(-)

(limited to 'themes')

diff --git a/modules/digibug/helpers/digibug_menu.php b/modules/digibug/helpers/digibug_menu.php
index 1ff0f6bf..6c466031 100644
--- a/modules/digibug/helpers/digibug_menu.php
+++ b/modules/digibug/helpers/digibug_menu.php
@@ -27,17 +27,13 @@ class digibug_menu {
   }
 
   static function photo($menu, $theme) {
-  }
-
-  static function site($menu, $theme) {
     $item = $theme->item();
-
-    if ($item && access::can("edit", $item)) {
-      $options_menu = $menu->get("options_menu")
-        ->append(Menu::factory("dialog")
-          ->id("digibug")
-          ->label(t("Peform Digibug Processing"))
-          ->url(url::site("digibug/index/$item->id")));
-    }
+    $csrf = access::csrf_token();
+    $menu
+      ->append(Menu::factory("link")
+               ->id("digibug")
+               ->label(t("Print with Digibug"))
+               ->url(url::site("digibug/print_photo/{$item->id}?csrf={$csrf}"))
+               ->css_id("gDigibugLink"));
   }
 }
diff --git a/modules/digibug/js/digibug.js b/modules/digibug/js/digibug.js
index e9e8933e..837c8f7f 100644
--- a/modules/digibug/js/digibug.js
+++ b/modules/digibug/js/digibug.js
@@ -3,6 +3,10 @@ $(document).ready(function() {
     e.preventDefault();
     queue_print(e);
   });
+  $("#gDigibugLink").click(function(e) {
+    e.preventDefault();
+    return queue_print(e);
+  });
 });
 
 function popUp(url, options) {
diff --git a/themes/default/css/screen.css b/themes/default/css/screen.css
index a450356c..8967efdf 100644
--- a/themes/default/css/screen.css
+++ b/themes/default/css/screen.css
@@ -665,6 +665,10 @@ form .gError,
   background-image: url('../images/ico-view-comments.png');
 }
 
+#gViewMenu #gDigibugLink {
+  background-image: url('../images/ico-print.png');
+}
+
 /* Breadcrumbs ~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 .gBreadcrumbs {
-- 
cgit v1.2.3


From 2d97a9a8b6b3b45b3cfdc426f8c476dd1ef104d4 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Wed, 24 Jun 2009 18:04:02 -0700
Subject: The image didn't get picked up on the previous commit

---
 themes/default/images/ico-print.png | Bin 0 -> 4411 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 themes/default/images/ico-print.png

(limited to 'themes')

diff --git a/themes/default/images/ico-print.png b/themes/default/images/ico-print.png
new file mode 100644
index 00000000..087e6694
Binary files /dev/null and b/themes/default/images/ico-print.png differ
-- 
cgit v1.2.3


From fae6d753e9107f16024e3de69483551a0bed2b59 Mon Sep 17 00:00:00 2001
From: Chad Kieffer <ckieffer@gmail.com>
Date: Wed, 24 Jun 2009 23:48:28 -0600
Subject: Group RTL styles together in their own section.

---
 themes/default/css/screen.css | 115 ++++++++++++++++--------------------------
 1 file changed, 43 insertions(+), 72 deletions(-)

(limited to 'themes')

diff --git a/themes/default/css/screen.css b/themes/default/css/screen.css
index 8967efdf..0f2d504c 100644
--- a/themes/default/css/screen.css
+++ b/themes/default/css/screen.css
@@ -12,16 +12,13 @@
  * 6)  Navigation and menus
  * 7)  Browser hacks
  * 8)  jQuery and jQuery UI
+ * 9)  Right-to-left language styles
  */
 
 /** *******************************************************************
  * 1) Basic HTML elements
  **********************************************************************/
 
-.rtl {
-  direction: rtl;
-}
-
 body, html {
   background-color: #ccc;
   font-family: 'Lucida Grande', 'Lucida Sans', Arial, sans-serif;
@@ -92,11 +89,11 @@ a:hover,
   margin: .3em 1em;
 }
 
-#gForgotPasswordLink, .rtl #gDialog .gCancel {
+#gForgotPasswordLink {
   float: right;
 }
 
-#gDialog .gCancel, .rtl #gForgotPasswordLink {
+#gDialog .gCancel {
   float: left;
 }
 
@@ -115,11 +112,6 @@ th {
   text-align: left;
 }
 
-.rtl caption,
-.rtl th {
-  text-align: right;
-}
-
 th {
   font-weight: bold;
 }
@@ -205,10 +197,6 @@ form ul ul li {
   float: left;
 }
 
-.rtl form ul ul li {
-  float: right;
-}
-
 input,
 select,
 textarea {
@@ -224,11 +212,6 @@ input[type="reset"] {
   float: left;
 }
 
-.rtl input[type="submit"],
-.rtl input[type="reset"] {
-  float: right;
-}
-
 /* Form validation ~~~~~~~~~~~~~~~~~~~~~~~ */
 
 .gValidationRule {
@@ -385,10 +368,6 @@ form .gError,
   padding: .4em 0;
 }
 
-.rtl .gShortForm li {
-  float: right;
-}
-
 .gShortForm label {
   display: none;
 }
@@ -453,21 +432,12 @@ form .gError,
   margin: -4px 10px 0 0;
 }
 
-.rtl #gHeader #gLogo {
-  float: right;
-}
-
 #gHeader #gQuickSearchForm {
   clear: right;
   float: right;
   margin: 1em 0;
 }
 
-.rtl #gHeader #gQuickSearchForm {
-  clear: left;
-  float: left;
-}
-
 #gHeader #gQuickSearchForm input[type='text'] {
   width: 17em;
 }
@@ -508,11 +478,6 @@ form .gError,
   width: 213px;
 }
 
-
-.rtl #gContent #gAlbumGrid .gItem {
-  float: right;
-}
-
 #gContent #gAlbumGrid .gItem h2 {
   margin: 5px 0;
 }
@@ -618,10 +583,6 @@ form .gError,
   float: right;
 }
 
-.rtl #gHeader #gLoginMenu {
-  float: left;
-}
-
 /* Site Menu  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #gSiteMenu {
@@ -630,10 +591,6 @@ form .gError,
   padding: 0 20px 0 0;
 }
 
-.rtl #gSiteMenu {
-  float: right;
-}
-
 #gSiteMenu ul {
   margin-bottom: 0;
 }
@@ -685,10 +642,6 @@ form .gError,
   padding: 10px 6px 10px 16px !important;
 }
 
-.rtl .gBreadcrumbs li {
-  float: right;
-}
-
 .gBreadcrumbs li.root {
   background: transparent;
 }
@@ -789,10 +742,6 @@ form .gError,
   width: 30%;
 }
 
-.rtl .gPager li {
-  float: right;
-}
-
 .gPager .gInfo {
   text-align: center;
   width: 40%;
@@ -861,12 +810,6 @@ form .gError,
   text-align: left;
 }
 
-.rtl #gDialog {
-  font-family: inherit;
-  font-size: inherit;
-  text-align: right;
-}
-
 #gDialog li {
   padding-left: 0;
 }
@@ -908,10 +851,6 @@ form .gError,
   float: left;
 }
 
-.rtl .gButtonSet li {
-  float: right;
-}
-
 .gButtonSet .gButtonLink {
   margin: 0;
 }
@@ -921,19 +860,11 @@ form .gError,
   margin-right: .2em;
 }
 
-.rtl .ui-icon-left .ui-icon {
-  float: right;
-}
-
 .ui-icon-right .ui-icon {
   float: right;
   margin-left: .2em;
 }
 
-.rtl .ui-icon-right .ui-icon {
-  float: left;
-}
-
 .ui-icon-rotate-ccw {
   background-position: -192px -64px;
 }
@@ -1105,3 +1036,43 @@ form .gError,
   margin-left: 20px;
   list-style-type: disc;
 }
+
+/* Right to left styles ~~~~~~~~~~~~~~~~~~~~ */
+
+.rtl {
+  direction: rtl;
+}
+
+.rtl caption,
+.rtl th {
+  text-align: right;
+}
+
+.rtl #gHeader #gQuickSearchForm,
+.rtl #gForgotPasswordLink,
+.rtl #gHeader #gLoginMenu,
+.rtl .ui-icon-right .ui-icon {
+  clear: left;
+  float: left;
+}
+
+.rtl #gDialog .gCancel,
+.rtl form ul ul li,
+.rtl input[type="submit"],
+.rtl input[type="reset"],
+.rtl .gShortForm li,
+.rtl #gHeader #gLogo,
+.rtl #gContent #gAlbumGrid .gItem,
+.rtl #gSiteMenu,
+.rtl .gBreadcrumbs li,
+.rtl .gPager li,
+.rtl .gButtonSet li,
+.rtl .ui-icon-left .ui-icon {
+  float: right;
+}
+
+.rtl #gDialog {
+  font-family: inherit;
+  font-size: inherit;
+  text-align: right;
+}
-- 
cgit v1.2.3


From ec67300f9628582bf735468c73aec3c01a6eb57f Mon Sep 17 00:00:00 2001
From: Chad Kieffer <ckieffer@gmail.com>
Date: Thu, 25 Jun 2009 00:06:59 -0600
Subject: Cleanup pass. Fixed formatting, grouped a few selectors. Removed
 empty selectors.

---
 themes/default/css/screen.css | 82 +++++++++++++++----------------------------
 1 file changed, 28 insertions(+), 54 deletions(-)

(limited to 'themes')

diff --git a/themes/default/css/screen.css b/themes/default/css/screen.css
index 0f2d504c..c7918fc0 100644
--- a/themes/default/css/screen.css
+++ b/themes/default/css/screen.css
@@ -28,17 +28,11 @@ p {
   margin-bottom: 1em;
 }
 
-strong {
-  font-weight: bold;
-}
-
 em {
   font-style: oblique;
 }
 
-/* Headings ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-h1, h2, h3, h4, h5 {
+h1, h2, h3, h4, h5, strong, th {
   font-weight: bold;
 }
 
@@ -50,6 +44,10 @@ h1 {
   margin-bottom: 1em;
 }
 
+#gProgress h1 {
+  font-size: 1.1em;
+}
+
 h2 {
   font-size: 1.4em;
 }
@@ -68,7 +66,8 @@ a,
 .gMenu a,
 #gDialog a,
 .gButtonLink,
-.gButtonLink:hover {
+.gButtonLink:hover,
+.gButtonLink:active {
   color: #5382BF !important;
   text-decoration: none;
   -moz-outline-style: none;
@@ -91,6 +90,7 @@ a:hover,
 
 #gForgotPasswordLink {
   float: right;
+  font-size: .9em;
 }
 
 #gDialog .gCancel {
@@ -112,10 +112,6 @@ th {
   text-align: left;
 }
 
-th {
-  font-weight: bold;
-}
-
 th,
 td {
   border: none;
@@ -144,7 +140,9 @@ legend {
 
 #gHeader legend,
 #gSidebar legend,
-#gContent #gSearchForm legend {
+#gContent #gSearchForm legend,
+input[type="hidden"],
+.gShortForm label {
   display: none;
 }
 
@@ -166,10 +164,6 @@ textarea {
   color: #333;
 }
 
-input[type="hidden"] {
-  display: none;
-}
-
 textarea {
   width: 100%;
   height: 12em;
@@ -368,10 +362,6 @@ form .gError,
   padding: .4em 0;
 }
 
-.gShortForm label {
-  display: none;
-}
-
 .gShortForm input[type="text"] {
   color: #666;
   padding: .3em .6em;
@@ -451,14 +441,6 @@ form .gError,
   padding-left: 1em;
 }
 
-/* Album/Photo information ~~~~~~~~~~~~~~~ */
-
-#gContent #gInfo {
-}
-
-#gContent #gInfo .gDescription {
-}
-
 /* Album content ~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #gContent #gAlbumGrid {
@@ -805,8 +787,6 @@ form .gError,
 }
 
 #gDialog {
-  font-family: inherit;
-  font-size: inherit;
   text-align: left;
 }
 
@@ -884,6 +864,7 @@ form .gError,
 }
 
 /* Server Add */
+
 .gCheckboxTree input {
   display: inline;
 }
@@ -922,7 +903,7 @@ form .gError,
   font-size: 1em;
   padding: 0;
   margin: 0;
-  border-top-width: 0px;
+  border-top-width: 0;
 }
 
 #gServerAdd p {
@@ -933,10 +914,10 @@ form .gError,
   padding: 10px 6px 10px 16px;
 }
 
-
 /* Permissions ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-#gPermissions .gDenied, #gPermissions .gAllowed {
+#gPermissions .gDenied,
+#gPermissions .gAllowed {
   text-align: center;
   vertical-align: middle;
 }
@@ -947,22 +928,18 @@ form .gError,
   background-color: #cfc;
 }
 
-
 /*************** STUFF THAT NEEDS A HOME ****************/
-#gProgress h1 {
-  font-size: 1.1em;
-}
 
 .gProgressBar {
   height: 1em;
   width: 100%;
-  margin-top: 0.5em;
+  margin-top: .5em;
   display: inline-block;
 }
 
 #gAddPhotos p {
-  margin: 0px;
-  padding: 0px;
+  margin: 0;
+  padding: 0;
 }
 
 #gAddPhotosCanvas {
@@ -1026,13 +1003,15 @@ form .gError,
   margin-bottom: 10px;
 }
 
-#gAdminG2ImportNotes p, #gAdminG2ImportDetails .gInfo p {
-  padding: 0px;
-  margin: 0px;
+#gAdminG2ImportNotes p,
+#gAdminG2ImportDetails .gInfo p {
+  padding: 0;
+  margin: 0;
 }
 
-#gAdminG2ImportNotes ul li, #gAdminG2Import .gInfo ul li {
-  padding-left: 0px;
+#gAdminG2ImportNotes ul li,
+#gAdminG2Import .gInfo ul li {
+  padding-left: 0;
   margin-left: 20px;
   list-style-type: disc;
 }
@@ -1044,7 +1023,8 @@ form .gError,
 }
 
 .rtl caption,
-.rtl th {
+.rtl th,
+.rtl #gDialog {
   text-align: right;
 }
 
@@ -1069,10 +1049,4 @@ form .gError,
 .rtl .gButtonSet li,
 .rtl .ui-icon-left .ui-icon {
   float: right;
-}
-
-.rtl #gDialog {
-  font-family: inherit;
-  font-size: inherit;
-  text-align: right;
-}
+}
\ No newline at end of file
-- 
cgit v1.2.3


From d9e4ad79bbebb3f439df4403c668271c86c19935 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Thu, 25 Jun 2009 08:14:34 -0700
Subject: 1) Move the digibug css in the default and admin_default themes 2)
 Remove most of the marketing cruft on the admin pages 3) Change the name of
 the admin settings to just Digibug 4) Remove the "switch on mouseover"
 approach

---
 modules/digibug/css/digibug.css              |  91 --------------------------
 modules/digibug/css/logo.png                 | Bin 17296 -> 0 bytes
 modules/digibug/helpers/digibug_menu.php     |   2 +-
 modules/digibug/helpers/digibug_theme.php    |  10 +--
 modules/digibug/views/admin_digibug.html.php |  33 ++--------
 themes/admin_default/css/screen.css          |  93 +++++++++++++++++++++++++++
 themes/admin_default/images/digibug_logo.png | Bin 0 -> 17296 bytes
 themes/default/css/screen.css                |  25 ++++---
 8 files changed, 115 insertions(+), 139 deletions(-)
 delete mode 100644 modules/digibug/css/digibug.css
 delete mode 100644 modules/digibug/css/logo.png
 create mode 100644 themes/admin_default/images/digibug_logo.png

(limited to 'themes')

diff --git a/modules/digibug/css/digibug.css b/modules/digibug/css/digibug.css
deleted file mode 100644
index a09e4551..00000000
--- a/modules/digibug/css/digibug.css
+++ /dev/null
@@ -1,91 +0,0 @@
-.gAdminDigibugIntro {
-  background-image: url(logo.png);
-  background-repeat: no-repeat;
-  padding-bottom: 20px;
-  width: 820px;
-}
-
-.gAdminDigibugIntro p {
-  font-family: Trebuchet MS,Arial,Verdana,Helvetica,sans-serif;
-  font-size: 1.3em;
-  font-weight: bold;
-  padding-left: 110px;
-  padding-top: 15px;
-}
-
-.gDigibugTab {
-  width: 820px;
-  height: 420px;
-}
-
-.gDigibugTab .gDigibugTitle {
-  font-family: Georgia;
-  font-size: 20px;
-  font-weight: bold;
-  padding-bottom: 10px;
-}
-
-.gDigibugTab .gDigibugText {
-  font-size: 12px;
-  font-weight: bold;
-  line-height: 17px;
-  padding-bottom: 15px;
-}
-
-.gDigibugListItems ul {
-  list-style-type: disc;
-  padding-left: 20px;
-  font-size: 12px;
-  font-weight: bold;
-  line-height: 15px;
-}
-
-.gDigibugListItems ul li{
-  padding-top: 10px;
-}
-
-.gDigibugRounded {
-  background-color:#5C9CCC;
-  color: white;
-  width: 308px;
-  height: 45px;
-  text-align: center;
-  line-height: 15px;
-  margin-top: 10px;
-  font-weight: bold;
-  font-size: 12px;
-  margin-left: 60px;
-  margin-right: -50px;
-  margin-left: 20px;
-  margin-right: 0px;
-}
-
-.gDigibugRounded a {
-  color: white !important;
-  font-weight: bold;
-  text-decoration: underline;
-}
-
-.gDigibugSignIn {
-  width: 115px;
-  float: left;
-}
-
-.gDigibugSignIn a {
-  color: black;
-  font-size: 16px;
-  font-weight: bold;
-  text-decoration: underline;
-}
-
-.gDigibugAdvancedForm {
-  float: left;
-  padding-left: 30px;
-  width: 180px;
-}
-
-.gDigibugPrintButton {
-  float: left;
-}
-
-
diff --git a/modules/digibug/css/logo.png b/modules/digibug/css/logo.png
deleted file mode 100644
index 5eac2c7d..00000000
Binary files a/modules/digibug/css/logo.png and /dev/null differ
diff --git a/modules/digibug/helpers/digibug_menu.php b/modules/digibug/helpers/digibug_menu.php
index 6c466031..d9baf59c 100644
--- a/modules/digibug/helpers/digibug_menu.php
+++ b/modules/digibug/helpers/digibug_menu.php
@@ -22,7 +22,7 @@ class digibug_menu {
     $menu->get("settings_menu")
       ->append(Menu::factory("link")
         ->id("digibug_menu")
-        ->label(t("Digibug Administration"))
+        ->label(t("Digibug"))
         ->url(url::site("admin/digibug")));
   }
 
diff --git a/modules/digibug/helpers/digibug_theme.php b/modules/digibug/helpers/digibug_theme.php
index e52fcc7f..bd269256 100644
--- a/modules/digibug/helpers/digibug_theme.php
+++ b/modules/digibug/helpers/digibug_theme.php
@@ -19,15 +19,7 @@
  */
 class digibug_theme_Core {
   static function head($theme) {
-    $head[] = "<link media=\"screen, projection\" rel=\"stylesheet\" type=\"text/css\" href=\"" .
-      url::file("modules/digibug/css/digibug.css") . "\" />";
-    $head[] = html::script("modules/digibug/js/digibug.js");;
-    return implode("\n", $head);
-  }
-
-  static function admin_head($theme) {
-    return "<link media=\"screen, projection\" rel=\"stylesheet\" type=\"text/css\" href=\"" .
-      url::file("modules/digibug/css/digibug.css") . "\" />";
+    return html::script("modules/digibug/js/digibug.js");
   }
 
   static function thumb_bottom($theme, $child) {
diff --git a/modules/digibug/views/admin_digibug.html.php b/modules/digibug/views/admin_digibug.html.php
index 33ce5f83..205d8b7a 100644
--- a/modules/digibug/views/admin_digibug.html.php
+++ b/modules/digibug/views/admin_digibug.html.php
@@ -1,16 +1,13 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <script type="text/javascript">
   $("#gDigibugTabs").ready(function() {
-    $("#gDigibugTabs").tabs({
-      event: "mouseover"
-    });
+    $("#gDigibugTabs").tabs({});
   });
 </script>
 <div id="gAdminDigibug">
-  <h2><?= t("Digibug Adminstration") ?>  </h2>
   <div class="gAdminDigibugIntro">
     <p>
-      <?= t("Digibug offers you two options for turning your photos into a wide variety of prints, gifts and games. Choose your solution and get started today!") ?>
+      <?= t("offers you two options for turning your photos into a wide variety of prints, gifts and games. Choose your solution and get started today!") ?>
     </p>
   </div>
   <div id="gDigibugTabs">
@@ -19,20 +16,8 @@
       <li><a href="#gDigibugTabAdvanced"><?= t("Advanced") ?></a></li>
     </ul>
     <div id="gDigibugTabBasic" class="gDigibugTab">
-      <div class="gDigibugTitle">
-        <?= t("Digibug Basic") ?>
-        <br/>
-        <?= t("Fast Easy Photo Fulfillment") ?>
-      </div>
       <div class="gDigibugText">
-        <?= t("Power up your Gallery with professional level fulfillment from Kodak. Just use Digibug Basic and there's nothing else to do - no registration, no administration, no hassles.") ?>
-      </div>
-      <div class="gDigibugListItems">
-        <ul>
-          <li><?= t("Matte and Glossy prints, from 4x6 to as big as 30x40") ?></li>
-          <li><?= t("Great photo gifts like canvases, apparel, bags, puzzles, mugs and sports memorabilia and more") ?></li>
-          <li><?= t("Outstanding quality and customer service") ?></li>
-        </ul>
+        <?= t("Use Digibug Basic and there's nothing else to do - no registration, no administration.") ?>
       </div>
       <div class="gDigibugRounded ui-corner-all">
         <br/>
@@ -45,16 +30,8 @@
       </div>
     </div>
     <div id="gDigibugTabAdvanced" class="gDigibugTab">
-      <div class="gDigibugTitle">
-        <?= t("Digibug ADVANCED") ?>
-        <br/>
-        <?= t("The Pro\'s Solution") ?>
-      </div>
-      <div class="gDigibugText">
-        <?= t("Digibug ADVANCED allows you to set your own price for photos and gifts. Simply provide us with your account information and we'll send you a check each month with your profits. It's the perfect online retail business solution for a photographer - no inventory, no overhead... just profits!") ?>
-      </div>
       <div class="gDigibugText">
-        <?= t("Enjoy the same range of professional level photo prints and gifts, but set your own price and charge what you believe your photos are worth. We'll take care of the rest.") ?>
+        <?= t("Digibug Advanced allows you to set your own price for photos and gifts. Simply provide your account information.") ?>
       </div>
       <div style="width: 120px;" class="gDigibugText gDigibugSignIn">
         <?= t("New to Digibug ADVANCED?") ?>
@@ -62,7 +39,7 @@
         <a href="http://www.digibug.com/signup.php" style=""><?= t("Sign up") ?></a><?= t(" to get started") ?>
       </div>
       <div class="gDigibugAdvancedForm">
-        <div class="gDigibugText"><?= t("Do you have a Digibug Company ID and Event ID?") ?></div>
+        <div class="gDigibugText"><?= t("Enter your Digibug company ID and event ID") ?></div>
         <?= $form ?>
       </div>
     </div>
diff --git a/themes/admin_default/css/screen.css b/themes/admin_default/css/screen.css
index 862f1fc1..1653f115 100644
--- a/themes/admin_default/css/screen.css
+++ b/themes/admin_default/css/screen.css
@@ -9,6 +9,8 @@
  * 4) Content blocks in specific layout containers
  * 5) Browser hacks
  * 6) jQuery and jQuery UI
+ * 7) Server Add
+ * 8) Digibug Print Administration
  */
 
 /** *******************************************************************
@@ -436,3 +438,94 @@ li.gDefaultGroup h4, li.gDefaultGroup .gUser {
   width: 150px;
   overflow: hidden;
 }
+
+/** *******************************************************************
+ * 8) Digibug Print Administration
+ **********************************************************************/
+.gAdminDigibugIntro {
+  background-image: url(../images/digibug_logo.png);
+  background-repeat: no-repeat;
+  padding-bottom: 20px;
+  width: 820px;
+}
+
+.gAdminDigibugIntro p {
+  font-family: Trebuchet MS,Arial,Verdana,Helvetica,sans-serif;
+  font-size: 1.3em;
+  font-weight: bold;
+  padding-left: 5px;
+  padding-top: 15px;
+  text-indent: 110px;
+}
+
+.gDigibugTab {
+  width: 820px;
+  height: 420px;
+}
+
+.gDigibugTab .gDigibugTitle {
+  font-family: Georgia;
+  font-size: 20px;
+  font-weight: bold;
+  padding-bottom: 10px;
+}
+
+.gDigibugTab .gDigibugText {
+  font-size: 12px;
+  font-weight: bold;
+  line-height: 17px;
+  padding-bottom: 15px;
+}
+
+.gDigibugListItems ul {
+  list-style-type: disc;
+  padding-left: 20px;
+  font-size: 12px;
+  font-weight: bold;
+  line-height: 15px;
+}
+
+.gDigibugListItems ul li{
+  padding-top: 10px;
+}
+
+.gDigibugRounded {
+  background-color:#5C9CCC;
+  color: white;
+  width: 308px;
+  height: 45px;
+  text-align: center;
+  line-height: 15px;
+  margin-top: 10px;
+  font-weight: bold;
+  font-size: 12px;
+  margin-left: 60px;
+  margin-right: -50px;
+  margin-left: 20px;
+  margin-right: 0px;
+}
+
+.gDigibugRounded a {
+  color: white !important;
+  font-weight: bold;
+  text-decoration: underline;
+}
+
+.gDigibugSignIn {
+  width: 115px;
+  float: left;
+}
+
+.gDigibugSignIn a {
+  color: black;
+  font-size: 16px;
+  font-weight: bold;
+  text-decoration: underline;
+}
+
+.gDigibugAdvancedForm {
+  float: left;
+  padding-left: 30px;
+  width: 180px;
+}
+
diff --git a/themes/admin_default/images/digibug_logo.png b/themes/admin_default/images/digibug_logo.png
new file mode 100644
index 00000000..5eac2c7d
Binary files /dev/null and b/themes/admin_default/images/digibug_logo.png differ
diff --git a/themes/default/css/screen.css b/themes/default/css/screen.css
index c7918fc0..671b259d 100644
--- a/themes/default/css/screen.css
+++ b/themes/default/css/screen.css
@@ -4,15 +4,16 @@
  * @requires YUI reset, font, grids CSS
  *
  * Sheet organization:
- * 1)  Basic HTML elements
- * 2)  Reusable classes
- * 3)  Reusable content blocks
- * 4)  Page layout containers
- * 5)  Content blocks in specific layout containers
- * 6)  Navigation and menus
- * 7)  Browser hacks
- * 8)  jQuery and jQuery UI
- * 9)  Right-to-left language styles
+ *  1)  Basic HTML elements
+ *  2)  Reusable classes
+ *  3)  Reusable content blocks
+ *  4)  Page layout containers
+ *  5)  Content blocks in specific layout containers
+ *  6)  Navigation and menus
+ *  7)  Browser hacks
+ *  8)  jQuery and jQuery UI
+ *  9)  Right-to-left language styles
+ * 10)  Digibug Print
  */
 
 /** *******************************************************************
@@ -1049,4 +1050,8 @@ form .gError,
 .rtl .gButtonSet li,
 .rtl .ui-icon-left .ui-icon {
   float: right;
-}
\ No newline at end of file
+}
+
+/** *******************************************************************
+ * 10)  Digibug Print
+ **********************************************************************/
-- 
cgit v1.2.3


From 627b5e144caefb7ff48224a4bdc8faae2debdbd7 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Thu, 25 Jun 2009 08:53:04 -0700
Subject: This change to the default/css/screen.css file was overlooked

---
 themes/default/css/screen.css | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'themes')

diff --git a/themes/default/css/screen.css b/themes/default/css/screen.css
index 671b259d..7075494d 100644
--- a/themes/default/css/screen.css
+++ b/themes/default/css/screen.css
@@ -1055,3 +1055,6 @@ form .gError,
 /** *******************************************************************
  * 10)  Digibug Print
  **********************************************************************/
+.gDigibugPrintButton {
+  float: left;
+}
-- 
cgit v1.2.3


From 1b263c312f621bc3439d0c6b60645c01424174aa Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Thu, 25 Jun 2009 18:26:31 -0700
Subject: Replace the crappy temporary print image with one that is more
 consistent with the theme.  Thanks again Ben Dunkle.

---
 themes/default/images/ico-print.png | Bin 4411 -> 989 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

(limited to 'themes')

diff --git a/themes/default/images/ico-print.png b/themes/default/images/ico-print.png
index 087e6694..b82a8e1e 100644
Binary files a/themes/default/images/ico-print.png and b/themes/default/images/ico-print.png differ
-- 
cgit v1.2.3


From e2e1aa06834125f10e03f929a41e527ec7c2f8ea Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Thu, 25 Jun 2009 21:41:54 -0700
Subject: 1) Rename the basic_company_id and basic_event_id to default_*_id 2)
 Removed the tabs on the digibug admin page word count is now at 35. 3) Added
 a default link which resets the event and company id's to gallery's ids

---
 modules/digibug/controllers/admin_digibug.php | 34 +++++++++---------
 modules/digibug/controllers/digibug.php       | 14 ++++----
 modules/digibug/helpers/digibug_installer.php |  4 +--
 themes/admin_default/css/screen.css           | 52 +++++----------------------
 4 files changed, 33 insertions(+), 71 deletions(-)

(limited to 'themes')

diff --git a/modules/digibug/controllers/admin_digibug.php b/modules/digibug/controllers/admin_digibug.php
index 8263fc83..9b75cb11 100644
--- a/modules/digibug/controllers/admin_digibug.php
+++ b/modules/digibug/controllers/admin_digibug.php
@@ -22,24 +22,14 @@ class Admin_Digibug_Controller extends Admin_Controller {
     print $this->_get_view();
   }
 
-  public function basic() {
-    access::verify_csrf();
-
-    module::set_var("digibug", "mode", "basic");
-    message::success(t("Successfully set Digibug mode to basic"));
-
-    url::redirect("admin/digibug");
-  }
-
-  public function advanced() {
+  public function update() {
     access::verify_csrf();
 
     $form = $this->_get_form();
     if ($form->validate()) {
       module::set_var("digibug", "company_id", $form->group->company_id->value);
       module::set_var("digibug", "event_id", $form->group->event_id->value);
-      module::set_var("digibug", "mode", "advanced");
-      message::success(t("Successfully set Digibug mode to advanced"));
+      message::success(t("Successfully updated Digibug company and event id's"));
 
       url::redirect("admin/digibug");
     }
@@ -47,18 +37,28 @@ class Admin_Digibug_Controller extends Admin_Controller {
     print $this->_get_view($form);
   }
 
+  public function default_settings() {
+    access::verify_csrf();
+
+    module::set_var("digibug", "company_id", module::get_var("digibug", "default_company_id"));
+    module::set_var("digibug", "event_id", module::get_var("digibug", "default_event_id"));
+    message::success(t("Successfully set Digibug company and event id's to default"));
+
+    url::redirect("admin/digibug");
+  }
+
   private function _get_view($form=null) {
     $v = new Admin_View("admin.html");
     $v->content = new View("admin_digibug.html");
-    $v->content->mode = module::get_var("digibug", "mode", "basic");
     $v->content->form = empty($form) ? $this->_get_form() : $form;
     return $v;
   }
 
   private function _get_form() {
-    $form = new Forge("admin/digibug/advanced", "", "post",
-                      array("id" => "gAdminForm"));
-    $group = $form->group("group");
+    $form = new Forge("admin/digibug/update", "", "post",
+                      array("id" => "gDigibugForm"));
+    $group = $form->group("group")
+      ->label(t("Enter your account information."));
     $group->input("company_id")
       ->label(t("Company Id"))
       ->rules("required")
@@ -67,7 +67,7 @@ class Admin_Digibug_Controller extends Admin_Controller {
       ->label(t("Event Id"))
       ->rules("required")
       ->value(module::get_var("digibug", "event_id", ""));
-    $group->submit("submit")->value(t("Submit"));
+    $group->submit("")->value(t("Submit"));
 
     return $form;
   }
diff --git a/modules/digibug/controllers/digibug.php b/modules/digibug/controllers/digibug.php
index 25a9912a..6900c65a 100644
--- a/modules/digibug/controllers/digibug.php
+++ b/modules/digibug/controllers/digibug.php
@@ -29,13 +29,11 @@ class Digibug_Controller extends Controller {
     $proxy->save();
 
     $url = url::abs_site("digibug/print_proxy/{$proxy->uuid}");
-    if (module::get_var("digibug", "mode", "basic")) {
-      $company_id = module::get_var("digibug", "basic_company_id");
-      $event_id = module::get_var("digibug", "basic_event_id");
-    } else {
-      $company_id = module::get_var("digibug", "company_id");
-      $event_id = module::get_var("digibug", "event_id");
-    }
+    $company_id = module::get_var("digibug", "company_id",
+                                  module::get_var("digibug", "default_company_id"));
+    $event_id = module::get_var("digibug", "event_id",
+                                module::get_var("digibug", "default_event_id"));
+
     $v = new View("digibug_form.html");
     $v->order_parms = array(
       "digibug_api_version" => "100",
@@ -50,7 +48,7 @@ class Digibug_Controller extends Controller {
       "image_width_1" => $item->width,
       "thumb_height_1" => $item->thumb_height,
       "thumb_width_1" => $item->thumb_width,
-      "title_1" => $item->title);
+      "title_1" => p::clean($item->title));
 
     print $v;
   }
diff --git a/modules/digibug/helpers/digibug_installer.php b/modules/digibug/helpers/digibug_installer.php
index 83b58351..be2b8a6b 100644
--- a/modules/digibug/helpers/digibug_installer.php
+++ b/modules/digibug/helpers/digibug_installer.php
@@ -28,8 +28,8 @@ class digibug_installer {
                    PRIMARY KEY (`id`))
                  ENGINE=InnoDB DEFAULT CHARSET=utf8;");
 
-    module::set_var("digibug", "basic_company_id", "3153");
-    module::set_var("digibug", "basic_event_id", "8491");
+    module::set_var("digibug", "default_company_id", "3153");
+    module::set_var("digibug", "default_event_id", "8491");
     module::set_var("digibug", "mode", "basic");
 
     module::set_version("digibug", 1);
diff --git a/themes/admin_default/css/screen.css b/themes/admin_default/css/screen.css
index 1653f115..d66115ef 100644
--- a/themes/admin_default/css/screen.css
+++ b/themes/admin_default/css/screen.css
@@ -458,18 +458,11 @@ li.gDefaultGroup h4, li.gDefaultGroup .gUser {
   text-indent: 110px;
 }
 
-.gDigibugTab {
+.gDigibugAccount {
   width: 820px;
   height: 420px;
 }
 
-.gDigibugTab .gDigibugTitle {
-  font-family: Georgia;
-  font-size: 20px;
-  font-weight: bold;
-  padding-bottom: 10px;
-}
-
 .gDigibugTab .gDigibugText {
   font-size: 12px;
   font-weight: bold;
@@ -477,40 +470,6 @@ li.gDefaultGroup h4, li.gDefaultGroup .gUser {
   padding-bottom: 15px;
 }
 
-.gDigibugListItems ul {
-  list-style-type: disc;
-  padding-left: 20px;
-  font-size: 12px;
-  font-weight: bold;
-  line-height: 15px;
-}
-
-.gDigibugListItems ul li{
-  padding-top: 10px;
-}
-
-.gDigibugRounded {
-  background-color:#5C9CCC;
-  color: white;
-  width: 308px;
-  height: 45px;
-  text-align: center;
-  line-height: 15px;
-  margin-top: 10px;
-  font-weight: bold;
-  font-size: 12px;
-  margin-left: 60px;
-  margin-right: -50px;
-  margin-left: 20px;
-  margin-right: 0px;
-}
-
-.gDigibugRounded a {
-  color: white !important;
-  font-weight: bold;
-  text-decoration: underline;
-}
-
 .gDigibugSignIn {
   width: 115px;
   float: left;
@@ -523,9 +482,14 @@ li.gDefaultGroup h4, li.gDefaultGroup .gUser {
   text-decoration: underline;
 }
 
-.gDigibugAdvancedForm {
+#gDigibugForm {
   float: left;
   padding-left: 30px;
-  width: 180px;
+  width: 220px;
 }
 
+.gDigibugDefault {
+  clear: none;
+  float: left;
+  margin: .3em 1em;
+}
-- 
cgit v1.2.3


From 42a5bd20a550a9edb5ec84625037b9d85889ff63 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Fri, 26 Jun 2009 07:51:29 -0700
Subject: 1) Move the generation of script tags to gallery_theme::head and
 gallery_theme::admin_head. This allows us to potentially manage the scripts
 like we do in g2 (single file and compressed) 2) Change Theme_View::_call to
 always call the gallery_theme::$function first.

---
 modules/gallery/helpers/gallery_theme.php | 20 ++++++++++++++++++++
 modules/gallery/libraries/Theme_View.php  | 25 +++++++++++++++++++++++--
 themes/admin_default/views/admin.html.php | 10 +---------
 themes/default/views/page.html.php        | 12 ------------
 4 files changed, 44 insertions(+), 23 deletions(-)

(limited to 'themes')

diff --git a/modules/gallery/helpers/gallery_theme.php b/modules/gallery/helpers/gallery_theme.php
index a96c8f5b..24f4129b 100644
--- a/modules/gallery/helpers/gallery_theme.php
+++ b/modules/gallery/helpers/gallery_theme.php
@@ -21,6 +21,18 @@ class gallery_theme_Core {
   static function head($theme) {
     $session = Session::instance();
     $buf = "";
+    $buf .= html::script("lib/jquery.js");
+    $buf .= html::script("lib/jquery.form.js");
+    $buf .= html::script("lib/jquery-ui.js");
+    $buf .= html::script("lib/gallery.common.js");
+    $buf .= html::script("lib/gallery.dialog.js");
+    $buf .= html::script("lib/gallery.form.js");
+    $buf .= html::script("lib/superfish/js/superfish.js");
+    if ($theme->page_type == 'photo') {
+      $buf .= html::script("lib/jquery.scrollTo.js");
+      $buf .= html::script("lib/jquery.localscroll.js");
+    }
+    $buf .= html::script($theme->url("js/ui.init.js", false, true));
     if ($session->get("debug")) {
       $buf .= "<link rel=\"stylesheet\" type=\"text/css\" href=\"" .
         url::file("modules/gallery/css/debug.css") . "\" />";
@@ -79,6 +91,14 @@ class gallery_theme_Core {
   static function admin_head($theme) {
     $session = Session::instance();
     $buf = "";
+    $buf .= html::script("lib/jquery.js");
+    $buf .= html::script("lib/jquery.form.js");
+    $buf .= html::script("lib/jquery-ui.js");
+    $buf .= html::script("lib/gallery.common.js");
+    $buf .= html::script("lib/gallery.dialog.js");
+    $buf .= html::script("lib/superfish/js/superfish.js");
+    $buf .= html::script($theme->url("js/jquery.dropshadow.js", false, true));
+    $buf .= html::script($theme->url("js/ui.init.js", false, true));
     if ($session->get("debug")) {
       $buf .= "<link rel=\"stylesheet\" type=\"text/css\" href=\"" .
         url::file("modules/gallery/css/debug.css") . "\" />";
diff --git a/modules/gallery/libraries/Theme_View.php b/modules/gallery/libraries/Theme_View.php
index 7b2ca840..5235fabb 100644
--- a/modules/gallery/libraries/Theme_View.php
+++ b/modules/gallery/libraries/Theme_View.php
@@ -68,9 +68,9 @@ class Theme_View_Core extends View {
     return module::get_var("gallery", "thumb_size", 200) / 200;
   }
 
-  public function url($path, $absolute_url=false) {
+  public function url($path, $absolute_url=false, $no_root=false) {
     $arg = "themes/{$this->theme_name}/$path";
-    return $absolute_url ? url::abs_file($arg) : url::file($arg);
+    return $absolute_url ? url::abs_file($arg) : $no_root ? $arg : url::file($arg);
   }
 
   public function item() {
@@ -192,7 +192,28 @@ class Theme_View_Core extends View {
     case "thumb_info":
     case "thumb_top":
       $blocks = array();
+      if (method_exists("gallery_theme", $function)) {
+        switch (count($args)) {
+        case 0:
+          $blocks[] = gallery_theme::$function($this);
+          break;
+        case 1:
+          $blocks[] = gallery_theme::$function($this, $args[0]);
+          break;
+        case 2:
+          $blocks[] = gallery_theme::$function($this, $args[0], $args[1]);
+          break;
+        default:
+          $blocks[] = call_user_func_array(
+            array("gallery_theme", $function),
+            array_merge(array($this), $args));
+        }
+
+      }
       foreach (module::active() as $module) {
+        if ($module->name == "gallery") {
+          continue;
+        }
         $helper_class = "{$module->name}_theme";
         if (method_exists($helper_class, $function)) {
           $blocks[] = call_user_func_array(
diff --git a/themes/admin_default/views/admin.html.php b/themes/admin_default/views/admin.html.php
index b7cfaa40..dfbafe31 100644
--- a/themes/admin_default/views/admin.html.php
+++ b/themes/admin_default/views/admin.html.php
@@ -20,15 +20,7 @@
     <link rel="stylesheet" type="text/css" href="<?= $theme->url("css/fix-ie.css") ?>"
         media="screen,print,projection" />
    <![endif]-->
-    <script src="<?= url::file("lib/jquery.js") ?>" type="text/javascript"></script>
-    <script src="<?= url::file("lib/jquery.form.js") ?>" type="text/javascript"></script>
-    <script src="<?= url::file("lib/jquery-ui.js") ?>" type="text/javascript"></script>
-    <script src="<?= url::file("lib/gallery.common.js") ?>" type="text/javascript"></script>
-    <script src="<?= url::file("lib/gallery.dialog.js") ?>" type="text/javascript"></script>
-    <script src="<?= url::file("lib/superfish/js/superfish.js") ?>" type="text/javascript"></script>
-    <script src="<?= $theme->url("js/jquery.dropshadow.js") ?>" type="text/javascript"></script>
-    <script src="<?= $theme->url("js/ui.init.js") ?>" type="text/javascript"></script>
-    <?= $theme->admin_head() ?>
+   <?= $theme->admin_head() ?>
   </head>
 
   <body <?= $theme->body_attributes() ?>>
diff --git a/themes/default/views/page.html.php b/themes/default/views/page.html.php
index f6286f95..c74d4097 100644
--- a/themes/default/views/page.html.php
+++ b/themes/default/views/page.html.php
@@ -49,18 +49,6 @@
     </style>
       <? endif ?>
     <? endif ?>
-    <script src="<?= url::file("lib/jquery.js") ?>" type="text/javascript"></script>
-    <script src="<?= url::file("lib/jquery.form.js") ?>" type="text/javascript"></script>
-    <script src="<?= url::file("lib/jquery-ui.js") ?>" type="text/javascript"></script>
-    <script src="<?= url::file("lib/gallery.common.js") ?>" type="text/javascript"></script>
-    <script src="<?= url::file("lib/gallery.dialog.js") ?>" type="text/javascript"></script>
-    <script src="<?= url::file("lib/gallery.form.js") ?>" type="text/javascript"></script>
-    <script src="<?= url::file("lib/superfish/js/superfish.js") ?>" type="text/javascript"></script>
-    <? if ($theme->page_type == 'photo'): ?>
-    <script src="<?= url::file("lib/jquery.scrollTo.js") ?>" type="text/javascript"></script>
-    <script src="<?= url::file("lib/jquery.localscroll.js") ?>" type="text/javascript"></script>
-    <? endif ?>
-    <script src="<?= $theme->url("js/ui.init.js") ?>" type="text/javascript"></script>
     <?= $theme->head() ?>
   </head>
 
-- 
cgit v1.2.3


From 84e98e830c4967c277dfcb5bb6d18c0ec3313355 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Fri, 26 Jun 2009 08:25:24 -0700
Subject: Move the inclusion of photo and movie specific javascript into
 gallery_theme

---
 modules/gallery/helpers/gallery_theme.php | 4 ++++
 themes/default/views/movie.html.php       | 1 -
 themes/default/views/photo.html.php       | 1 -
 3 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'themes')

diff --git a/modules/gallery/helpers/gallery_theme.php b/modules/gallery/helpers/gallery_theme.php
index 24f4129b..0679087e 100644
--- a/modules/gallery/helpers/gallery_theme.php
+++ b/modules/gallery/helpers/gallery_theme.php
@@ -31,6 +31,10 @@ class gallery_theme_Core {
     if ($theme->page_type == 'photo') {
       $buf .= html::script("lib/jquery.scrollTo.js");
       $buf .= html::script("lib/jquery.localscroll.js");
+      $buf .= html::script("lib/gallery.show_full_size.js");
+    }
+    if ($theme->page_type == 'movie') {
+      $buf .= html::script("lib/flowplayer.js");
     }
     $buf .= html::script($theme->url("js/ui.init.js", false, true));
     if ($session->get("debug")) {
diff --git a/themes/default/views/movie.html.php b/themes/default/views/movie.html.php
index e8559697..134e3571 100644
--- a/themes/default/views/movie.html.php
+++ b/themes/default/views/movie.html.php
@@ -1,5 +1,4 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
-<script src="<?= url::file("lib/flowplayer.js") ?>" type="text/javascript"></script>
 <div id="gItem">
   <?= $theme->photo_top() ?>
 
diff --git a/themes/default/views/photo.html.php b/themes/default/views/photo.html.php
index 1c3b81a7..4765a4e3 100644
--- a/themes/default/views/photo.html.php
+++ b/themes/default/views/photo.html.php
@@ -2,7 +2,6 @@
 
 <? if (access::can("view_full", $theme->item())): ?>
 <!-- Use javascript to show the full size as an overlay on the current page -->
-<script src="<?= url::file("lib/gallery.show_full_size.js") ?>" type="text/javascript"></script>
 <script>
   $(document).ready(function() {
     $(".gFullSizeLink").click(function() {
-- 
cgit v1.2.3


From 2fbc03437ac6f861f597778964cf01737968bb94 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sat, 27 Jun 2009 15:55:47 -0700
Subject: Digibug simplification cleanup.  Upgrade digibug module to version 2.

1) Simplify the admin settings page to what most of our users
   want. Eliminate basic_ and default_ ids.  We just have company_id
   and default_id.  Advanced users can use advanced settings for now.

2) Fix security in print_photos (didn't get it right in my last commit)

3) Use the regular thumb and full urls if the images are publicly
   available to reduce load on the proxy.

4) Simplify proxy expiration code.

5) Eliminate all specialized styles from the admin theme.
---
 modules/digibug/controllers/admin_digibug.php |  50 +-----------------
 modules/digibug/controllers/digibug.php       |  72 ++++++++++----------------
 modules/digibug/helpers/digibug_installer.php |  30 +++++++----
 modules/digibug/images/digibug_logo.png       | Bin 0 -> 17296 bytes
 modules/digibug/js/digibug.js                 |  31 +++++------
 modules/digibug/models/digibug_proxy.php      |   1 -
 modules/digibug/module.info                   |   2 +-
 modules/digibug/views/admin_digibug.html.php  |  29 ++++++-----
 modules/digibug/views/digibug_form.html.php   |  11 ++--
 themes/admin_default/css/screen.css           |  54 -------------------
 themes/admin_default/images/digibug_logo.png  | Bin 17296 -> 0 bytes
 11 files changed, 82 insertions(+), 198 deletions(-)
 create mode 100644 modules/digibug/images/digibug_logo.png
 delete mode 100644 themes/admin_default/images/digibug_logo.png

(limited to 'themes')

diff --git a/modules/digibug/controllers/admin_digibug.php b/modules/digibug/controllers/admin_digibug.php
index bd9e9d95..7124338f 100644
--- a/modules/digibug/controllers/admin_digibug.php
+++ b/modules/digibug/controllers/admin_digibug.php
@@ -19,56 +19,8 @@
  */
 class Admin_Digibug_Controller extends Admin_Controller {
   public function index() {
-    print $this->_get_view();
-  }
-
-  public function update() {
-    access::verify_csrf();
-
-    $form = $this->_get_form();
-    if ($form->validate()) {
-      module::set_var("digibug", "company_id", $form->group->company_id->value);
-      module::set_var("digibug", "event_id", $form->group->event_id->value);
-      message::success(t("Successfully updated Digibug company and event id's"));
-
-      url::redirect("admin/digibug");
-    }
-
-    print $this->_get_view($form);
-  }
-
-  public function default_settings() {
-    access::verify_csrf();
-
-    module::set_var("digibug", "company_id", null);
-    module::set_var("digibug", "event_id", null);
-    message::success(t("Successfully set Digibug company and event id's to default"));
-
-    url::redirect("admin/digibug");
-  }
-
-  private function _get_view($form=null) {
     $v = new Admin_View("admin.html");
     $v->content = new View("admin_digibug.html");
-    $v->content->form = empty($form) ? $this->_get_form() : $form;
-    return $v;
-  }
-
-  private function _get_form() {
-    $form = new Forge("admin/digibug/update", "", "post",
-                      array("id" => "gDigibugForm"));
-    $group = $form->group("group")
-      ->label(t("Enter your account information."));
-    $group->input("company_id")
-      ->label(t("Company Id"))
-      ->rules("required")
-      ->value(module::get_var("digibug", "company_id", ""));
-    $group->input("event_id")
-      ->label(t("Event Id"))
-      ->rules("required")
-      ->value(module::get_var("digibug", "event_id", ""));
-    $group->submit("")->value(t("Submit"));
-
-    return $form;
+    print $v;
   }
 }
\ No newline at end of file
diff --git a/modules/digibug/controllers/digibug.php b/modules/digibug/controllers/digibug.php
index 45d3fde4..c1852009 100644
--- a/modules/digibug/controllers/digibug.php
+++ b/modules/digibug/controllers/digibug.php
@@ -20,55 +20,47 @@
 class Digibug_Controller extends Controller {
   public function print_photo($id) {
     access::verify_csrf();
-
     $item = ORM::factory("item", $id);
-    access::required("view_full", $id);
-
-    $proxy = ORM::factory("digibug_proxy");
-    $proxy->uuid =  md5(rand());
-    $proxy->item_id = $item->id;
-    $proxy->save();
-
-    $url = url::abs_site("digibug/print_proxy/{$proxy->uuid}");
-    $company_id = module::get_var("digibug", "company_id",
-                                  module::get_var("digibug", "default_company_id"));
-    $event_id = module::get_var("digibug", "event_id",
-                                module::get_var("digibug", "default_event_id"));
+    access::required("view_full", $item);
+
+    if (access::group_can(group::everybody(), "view_full", $item)) {
+      $full_url = $item->file_url(true);
+      $thumb_url = $item->thumb_url(true);
+    } else {
+      $proxy = ORM::factory("digibug_proxy");
+      $proxy->uuid =  md5(rand());
+      $proxy->item_id = $item->id;
+      $proxy->save();
+      $full_url = url::abs_site("digibug/print_proxy/full/$proxy->uuid");
+      $thumb_url = url::abs_site("digibug/print_proxy/thumb/$proxy->uuid");
+    }
 
     $v = new View("digibug_form.html");
     $v->order_parms = array(
       "digibug_api_version" => "100",
-      "company_id" => $company_id,
-      "event_id" => $event_id,
+      "company_id" => module::get_var("digibug", "company_id"),
+      "event_id" => module::get_var("digibug", "event_id"),
       "cmd" => "addimg",
       "return_url" => url::abs_site("digibug/close_window"),
       "num_images" => "1",
-      "image_1" => $url,
-      "thumb_1" => "$url/thumb",
+      "image_1" => $full_url,
+      "thumb_1" => $thumb_url,
       "image_height_1" => $item->height,
       "image_width_1" => $item->width,
       "thumb_height_1" => $item->thumb_height,
       "thumb_width_1" => $item->thumb_width,
       "title_1" => p::clean($item->title));
-    Kohana::log("error", Kohana::debug($v->order_parms));
 
     print $v;
   }
 
-  public function print_proxy($id, $thumb=null) {
-    $proxy = ORM::factory("digibug_proxy")
-      ->where("uuid", $id)
-      ->find();
-
-    if (!$proxy->loaded) {
-      Kohana::show_404();
-    }
-
-    if (!$proxy->item->loaded) {
+  public function print_proxy($type, $id) {
+    $proxy = ORM::factory("digibug_proxy", array("uuid", $id));
+    if (!$proxy->loaded || !$proxy->item->loaded) {
       Kohana::show_404();
     }
 
-    $file = empty($thumb) ? $proxy->item->file_path() : $proxy->item->thumb_path();
+    $file = $type == "full" ? $proxy->item->file_path() : $proxy->item->thumb_path();
     if (!file_exists($file)) {
       kohana::show_404();
     }
@@ -76,8 +68,6 @@ class Digibug_Controller extends Controller {
     // We don't need to save the session for this request
     Session::abort_save();
 
-    $this->_clean_expired();
-
     // Dump out the image
     header("Content-Type: $proxy->item->mime_type");
     Kohana::close_buffers(false);
@@ -86,9 +76,11 @@ class Digibug_Controller extends Controller {
     fclose($fd);
 
     // If the request was for the image and not the thumb, then delete the proxy.
-    if (empty($thumb)) {
+    if ($type == "full") {
       $proxy->delete();
     }
+
+    $this->_clean_expired();
   }
 
   public function close_window() {
@@ -96,17 +88,9 @@ class Digibug_Controller extends Controller {
   }
 
   private function _clean_expired() {
-    $expired = ORM::factory("digibug_proxy")
-      ->where("request_date <= (CURDATE() - INTERVAL 10 DAY)")
-      ->find_all();
-
-    // Delete as many as we can in a second, so as to not slow up the request.
-    $start = microtime(true);
-    foreach ($expired as $proxy) {
-      if (microtime(true) - $start > 1.0) {
-        break;
-      }
-      $proxy->delete();
-    }
+    Database::instance()>query(
+      "DELETE FROM {digibug_proxy} " .
+      "WHERE request_date <= (CURDATE() - INTERVAL 10 DAY) " .
+      "LIMIT 20");
   }
 }
\ No newline at end of file
diff --git a/modules/digibug/helpers/digibug_installer.php b/modules/digibug/helpers/digibug_installer.php
index f1308fd3..1cd78b44 100644
--- a/modules/digibug/helpers/digibug_installer.php
+++ b/modules/digibug/helpers/digibug_installer.php
@@ -21,16 +21,28 @@ class digibug_installer {
   static function install() {
     Database::instance()
       ->query("CREATE TABLE {digibug_proxies} (
-                   `id` int(9) NOT NULL AUTO_INCREMENT,
-                   `uuid` char(32) NOT NULL,
-                   `request_date` TIMESTAMP NOT NULL DEFAULT current_timestamp,
-                   `item_id` int(9) NOT NULL,
-                   PRIMARY KEY (`id`))
-                 ENGINE=InnoDB DEFAULT CHARSET=utf8;");
+                `id` int(9) NOT NULL AUTO_INCREMENT,
+                `uuid` char(32) NOT NULL,
+                `request_date` TIMESTAMP NOT NULL DEFAULT current_timestamp,
+                `item_id` int(9) NOT NULL,
+               PRIMARY KEY (`id`))
+               ENGINE=InnoDB DEFAULT CHARSET=utf8;");
 
-    module::set_var("digibug", "default_company_id", "3153");
-    module::set_var("digibug", "default_event_id", "8491");
-    module::set_version("digibug", 1);
+    module::set_var("digibug", "company_id", "3153");
+    module::set_var("digibug", "event_id", "8491");
+    module::set_version("digibug", 2);
+  }
+
+  static function upgrade($version) {
+    if ($version == 1) {
+      module::clear_var("digibug", "default_company_id");
+      module::clear_var("digibug", "default_event_id");
+      module::clear_var("digibug", "basic_default_company_id");
+      module::clear_var("digibug", "basic_event_id");
+      module::set_var("digibug", "company_id", "3153");
+      module::set_var("digibug", "event_id", "8491");
+      module::set_version("digibug", $version = 2);
+    }
   }
 
   static function uninstall() {
diff --git a/modules/digibug/images/digibug_logo.png b/modules/digibug/images/digibug_logo.png
new file mode 100644
index 00000000..5eac2c7d
Binary files /dev/null and b/modules/digibug/images/digibug_logo.png differ
diff --git a/modules/digibug/js/digibug.js b/modules/digibug/js/digibug.js
index 837c8f7f..456dfecb 100644
--- a/modules/digibug/js/digibug.js
+++ b/modules/digibug/js/digibug.js
@@ -1,26 +1,25 @@
 $(document).ready(function() {
   $(".gDigibugPrintButton a").click(function(e) {
     e.preventDefault();
-    queue_print(e);
+    return popUp(e.currentTarget.href, { width: 800, height: 600 } );
   });
   $("#gDigibugLink").click(function(e) {
     e.preventDefault();
-    return queue_print(e);
+    return popUp(e.currentTarget.href, { width: 800, height: 600 } );
   });
 });
 
 function popUp(url, options) {
   options = $.extend({
     /* default options */
-    width:      400,
-    height:     400,
     target:     'dbPopWin',
     scrollbars: 'yes',
     resizable:  'no',
     menuBar:    'no',
-    addressBar: 'yes'}, options);
+    addressBar: 'yes'
+  }, options);
 
-  /* center the window by default. */
+  // center the window by default.
   if (!options.winY) {
     options.winY = screen.height / 2 - options.height / 2;
   };
@@ -32,19 +31,15 @@ function popUp(url, options) {
     url,
     options['target'],
     'width= '      + options.width +
-      ',height='     + options.height +
-      ',top='        + options.winY +
-      ',left='       + options.winX +
-      ',scrollbars=' + options.scrollbars +
-      ',resizable='  + options.resizable +
-      ',menubar='    + options.menuBar +
-      ',location='   + options.addressBar
-  );
+    ',height='     + options.height +
+    ',top='        + options.winY +
+    ',left='       + options.winX +
+    ',scrollbars=' + options.scrollbars +
+    ',resizable='  + options.resizable +
+    ',menubar='    + options.menuBar +
+    ',location='   + options.addressBar
+    );
 
   return false;
 
 }
-
-function queue_print(e) {
-  return popUp(e.currentTarget.href, { width: 800, height: 600 } );
-};
diff --git a/modules/digibug/models/digibug_proxy.php b/modules/digibug/models/digibug_proxy.php
index c76afdae..036af9c7 100644
--- a/modules/digibug/models/digibug_proxy.php
+++ b/modules/digibug/models/digibug_proxy.php
@@ -18,5 +18,4 @@
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
 class Digibug_Proxy_Model extends ORM {
-  protected $has_one = array("item");
 }
diff --git a/modules/digibug/module.info b/modules/digibug/module.info
index 58602c0d..c25a2454 100644
--- a/modules/digibug/module.info
+++ b/modules/digibug/module.info
@@ -1,3 +1,3 @@
 name = Digibug
 description = Digibug Photo Printing Module
-version = 1
+version = 2
diff --git a/modules/digibug/views/admin_digibug.html.php b/modules/digibug/views/admin_digibug.html.php
index 769fd415..7e4436ff 100644
--- a/modules/digibug/views/admin_digibug.html.php
+++ b/modules/digibug/views/admin_digibug.html.php
@@ -1,21 +1,22 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
-<script type="text/javascript">
-  $("#gDigibugForm").ready(function() {
-    $("#gDigibugForm input:submit").parent().append('<a href="<?= url::site("admin/digibug/default_settings?csrf=$csrf") ?>" class="gDigibugDefault"><?= t("Set Default") ?></a>');
-  });
-</script>
 <div id="gAdminDigibug">
   <div class="gAdminDigibugIntro">
+    <img id="DigibugLogo" src="<?= url::file("modules/digibug/images/digibug_logo.png") ?>">
+    <h2> <?= t("Digibug Photo Printing") ?> </h2>
     <p>
-      <?= t("allows you to turn your photos into a wide variety of prints, gifts and games.") ?>
+      <?= t("Turn your photos into a wide variety of prints, gifts and games!") ?>
+    </p>
+
+    <ul id="gMessage">
+      <li class="gSuccess">
+        <?= t("You're ready to print photos!") ?>
+      </li>
+    </ul>
+
+    <p>
+      <?= t("You don't need an account with Digibug, but if you <a href=\"%signup_url\">register with Digibug</a> and enter your Digibug id in the <a href=\"%advanced_settings_url\">Advanced Settings</a> page you can make money off of your photos!",
+          array("signup_url" => "http://www.digibug.com/signup.php",
+      "advanced_settings_url" => url::site("admin/advanced_settings"))) ?>
     </p>
-  </div>
-  <div id="gDigibugAccount">
-    <div style="width: 120px;" class="gDigibugText gDigibugSignIn">
-      <?= t("Don't have an account?") ?>
-      <br/> <br/>
-      <a href="http://www.digibug.com/signup.php" style=""><?= t("Sign up") ?></a><?= t(" to get started") ?>
-    </div>
-      <?= $form ?>
   </div>
 </div>
diff --git a/modules/digibug/views/digibug_form.html.php b/modules/digibug/views/digibug_form.html.php
index e18cbc18..c6994cbe 100644
--- a/modules/digibug/views/digibug_form.html.php
+++ b/modules/digibug/views/digibug_form.html.php
@@ -1,16 +1,11 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <html>
-  <head>
-    <?= html::script("lib/jquery.js") ?>
-    <script type="text/javascript">
-      $("body form").ready(function() {
-        $("body form").submit();
-      });
-    </script>
-  </head>
   <body>
     <?= form::open("http://www.digibug.com/dapi/order.php") ?>
     <?= form::hidden($order_parms) ?>
     <?= form::close() ?>
+    <script type="text/javascript">
+      document.forms[0].submit();
+    </script>
   </body>
 </html>
diff --git a/themes/admin_default/css/screen.css b/themes/admin_default/css/screen.css
index d66115ef..f4173d4b 100644
--- a/themes/admin_default/css/screen.css
+++ b/themes/admin_default/css/screen.css
@@ -439,57 +439,3 @@ li.gDefaultGroup h4, li.gDefaultGroup .gUser {
   overflow: hidden;
 }
 
-/** *******************************************************************
- * 8) Digibug Print Administration
- **********************************************************************/
-.gAdminDigibugIntro {
-  background-image: url(../images/digibug_logo.png);
-  background-repeat: no-repeat;
-  padding-bottom: 20px;
-  width: 820px;
-}
-
-.gAdminDigibugIntro p {
-  font-family: Trebuchet MS,Arial,Verdana,Helvetica,sans-serif;
-  font-size: 1.3em;
-  font-weight: bold;
-  padding-left: 5px;
-  padding-top: 15px;
-  text-indent: 110px;
-}
-
-.gDigibugAccount {
-  width: 820px;
-  height: 420px;
-}
-
-.gDigibugTab .gDigibugText {
-  font-size: 12px;
-  font-weight: bold;
-  line-height: 17px;
-  padding-bottom: 15px;
-}
-
-.gDigibugSignIn {
-  width: 115px;
-  float: left;
-}
-
-.gDigibugSignIn a {
-  color: black;
-  font-size: 16px;
-  font-weight: bold;
-  text-decoration: underline;
-}
-
-#gDigibugForm {
-  float: left;
-  padding-left: 30px;
-  width: 220px;
-}
-
-.gDigibugDefault {
-  clear: none;
-  float: left;
-  margin: .3em 1em;
-}
diff --git a/themes/admin_default/images/digibug_logo.png b/themes/admin_default/images/digibug_logo.png
deleted file mode 100644
index 5eac2c7d..00000000
Binary files a/themes/admin_default/images/digibug_logo.png and /dev/null differ
-- 
cgit v1.2.3


From aad0dd357f44c75703e4d6368a1869a83e7ee8a2 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sat, 27 Jun 2009 16:27:06 -0700
Subject: Create a new thumb_menu() and convert Digibug over to use it.

1) Eliminate digibug_album.html

2) Get rid of the $(document).ready() in digibug.js and rename popUp() to
   digibug_popup() then just make direct calls to digibug_popup() in the
   menu urls.
---
 modules/digibug/helpers/digibug_menu.php     | 26 +++++++++++++++++++-------
 modules/digibug/helpers/digibug_theme.php    | 11 -----------
 modules/digibug/js/digibug.js                | 15 +++------------
 modules/digibug/views/digibug_album.html.php |  8 --------
 modules/gallery/helpers/gallery_menu.php     |  3 +++
 modules/gallery/libraries/Theme_View.php     | 10 +++++++---
 themes/default/views/album.html.php          |  1 +
 7 files changed, 33 insertions(+), 41 deletions(-)
 delete mode 100644 modules/digibug/views/digibug_album.html.php

(limited to 'themes')

diff --git a/modules/digibug/helpers/digibug_menu.php b/modules/digibug/helpers/digibug_menu.php
index 6d127d72..4b8db5a2 100644
--- a/modules/digibug/helpers/digibug_menu.php
+++ b/modules/digibug/helpers/digibug_menu.php
@@ -28,12 +28,24 @@ class digibug_menu {
 
   static function photo($menu, $theme) {
     $item = $theme->item();
-    $csrf = access::csrf_token();
-    $menu
-      ->append(Menu::factory("link")
-               ->id("digibug")
-               ->label(t("Print with Digibug"))
-               ->url(url::site("digibug/print_photo/$item->id?csrf=$csrf"))
-               ->css_id("gDigibugLink"));
+    $menu->append(
+      Menu::factory("link")
+      ->id("digibug")
+      ->label(t("Print with Digibug"))
+      ->url("javascript:digibug_popup('" .
+            url::site("digibug/print_photo/$item->id?csrf=$theme->csrf") . "')")
+      ->css_id("gDigibugLink"));
+  }
+
+  static function thumb($menu, $theme, $item) {
+    if ($item->type == "photo" && access::can("view_full", $item)) {
+      $menu->append(
+        Menu::factory("link")
+        ->id("digibug")
+        ->label(t("Print with Digibug"))
+        ->url("javascript:digibug_popup('" .
+              url::site("digibug/print_photo/$item->id?csrf=$theme->csrf") . "')")
+        ->css_id("gDigibugLink"));
+    }
   }
 }
diff --git a/modules/digibug/helpers/digibug_theme.php b/modules/digibug/helpers/digibug_theme.php
index a8e7e5b2..3b5be3b3 100644
--- a/modules/digibug/helpers/digibug_theme.php
+++ b/modules/digibug/helpers/digibug_theme.php
@@ -21,15 +21,4 @@ class digibug_theme_Core {
   static function head($theme) {
     return html::script("modules/digibug/js/digibug.js");
   }
-
-  static function thumb_bottom($theme, $child) {
-    if ($theme->page_type() == "album" && $child->type == "photo" &&
-        access::can("view_full", $child)) {
-      $v = new View("digibug_album.html");
-      $v->id = $child->id;
-      $v->title = t("Print photo with Digibug");
-      return $v->render();
-    }
-    return "";
-  }
 }
diff --git a/modules/digibug/js/digibug.js b/modules/digibug/js/digibug.js
index 456dfecb..78ca8cf3 100644
--- a/modules/digibug/js/digibug.js
+++ b/modules/digibug/js/digibug.js
@@ -1,17 +1,8 @@
-$(document).ready(function() {
-  $(".gDigibugPrintButton a").click(function(e) {
-    e.preventDefault();
-    return popUp(e.currentTarget.href, { width: 800, height: 600 } );
-  });
-  $("#gDigibugLink").click(function(e) {
-    e.preventDefault();
-    return popUp(e.currentTarget.href, { width: 800, height: 600 } );
-  });
-});
-
-function popUp(url, options) {
+function digibug_popup(url, options) {
   options = $.extend({
     /* default options */
+    width:      '800',
+    height:     '600',
     target:     'dbPopWin',
     scrollbars: 'yes',
     resizable:  'no',
diff --git a/modules/digibug/views/digibug_album.html.php b/modules/digibug/views/digibug_album.html.php
deleted file mode 100644
index 2fd8803b..00000000
--- a/modules/digibug/views/digibug_album.html.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.") ?>
-<div class="gDigibugPrintButton">
-  <a class="gButtonLink ui-corner-all ui-state-default ui-icon-left"
-     href="<?= url::site("digibug/print_photo/$id?csrf=$csrf") ?>"
-     title="<?= p::clean($title) ?>">
-    <span class="ui-icon ui-icon-print"><?= p::clean($title) ?></span>
-  </a>
-</div>
diff --git a/modules/gallery/helpers/gallery_menu.php b/modules/gallery/helpers/gallery_menu.php
index a25832fe..1f1e1ce2 100644
--- a/modules/gallery/helpers/gallery_menu.php
+++ b/modules/gallery/helpers/gallery_menu.php
@@ -94,6 +94,9 @@ class gallery_menu_Core {
   static function tag($menu, $theme) {
   }
 
+  static function thumb($menu, $theme, $item) {
+  }
+
   static function photo($menu, $theme) {
     if (access::can("view_full", $theme->item())) {
       $menu->append(Menu::factory("link")
diff --git a/modules/gallery/libraries/Theme_View.php b/modules/gallery/libraries/Theme_View.php
index 7b2ca840..4612a74b 100644
--- a/modules/gallery/libraries/Theme_View.php
+++ b/modules/gallery/libraries/Theme_View.php
@@ -121,16 +121,20 @@ class Theme_View_Core extends View {
     $this->_menu("photo");
   }
 
-  private function _menu($type) {
+  public function thumb_menu($item) {
+    $this->_menu("thumb", $item);
+  }
+
+  private function _menu($type, $item=null) {
     $menu = Menu::factory("root");
-    call_user_func_array(array("gallery_menu", $type), array(&$menu, $this));
+    call_user_func_array(array("gallery_menu", $type), array(&$menu, $this, $item));
     foreach (module::active() as $module) {
       if ($module->name == "gallery") {
         continue;
       }
       $class = "{$module->name}_menu";
       if (method_exists($class, $type)) {
-        call_user_func_array(array($class, $type), array(&$menu, $this));
+        call_user_func_array(array($class, $type), array(&$menu, $this, $item));
       }
     }
 
diff --git a/themes/default/views/album.html.php b/themes/default/views/album.html.php
index 7e6913df..46b0d29a 100644
--- a/themes/default/views/album.html.php
+++ b/themes/default/views/album.html.php
@@ -19,6 +19,7 @@
       <?= $child->thumb_img(array("class" => "gThumbnail")) ?>
     </a>
     <?= $theme->thumb_bottom($child) ?>
+    <?= $theme->thumb_menu($child) ?>
     <h2><span></span><a href="<?= $child->url() ?>"><?= p::clean($child->title) ?></a></h2>
     <ul class="gMetadata">
       <?= $theme->thumb_info($child) ?>
-- 
cgit v1.2.3


From 6c828a0dd61984da84fa7957f4ea40098dd67ec5 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sat, 27 Jun 2009 16:30:16 -0700
Subject: We no longer need the digibug section now that we've got a menu for
 thumbnail actions.

---
 themes/default/css/screen.css | 7 -------
 1 file changed, 7 deletions(-)

(limited to 'themes')

diff --git a/themes/default/css/screen.css b/themes/default/css/screen.css
index 7075494d..d3c4de6f 100644
--- a/themes/default/css/screen.css
+++ b/themes/default/css/screen.css
@@ -1051,10 +1051,3 @@ form .gError,
 .rtl .ui-icon-left .ui-icon {
   float: right;
 }
-
-/** *******************************************************************
- * 10)  Digibug Print
- **********************************************************************/
-.gDigibugPrintButton {
-  float: left;
-}
-- 
cgit v1.2.3


From 2b804ebdcea2127ca481ae3fb25a33a3bc5a78c3 Mon Sep 17 00:00:00 2001
From: Chad Kieffer <ckieffer@gmail.com>
Date: Sun, 28 Jun 2009 17:53:20 -0600
Subject: Convert info module's block to use a list instead of a table.
 Addresses request in ticket #441.

---
 modules/info/views/info_block.html.php | 75 +++++++++++++++-------------------
 themes/default/css/screen.css          |  4 ++
 2 files changed, 37 insertions(+), 42 deletions(-)

(limited to 'themes')

diff --git a/modules/info/views/info_block.html.php b/modules/info/views/info_block.html.php
index 9f9ec5df..3a96937c 100644
--- a/modules/info/views/info_block.html.php
+++ b/modules/info/views/info_block.html.php
@@ -1,44 +1,35 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
-<table class="gMetadata">
-  <tbody>
-    <tr>
-      <th><?= t("Title:") ?></th>
-      <td><?= p::clean($item->title) ?></td>
-    </tr>
-    <? if ($item->description): ?>
-    <tr>
-      <th><?= t("Description:") ?></th>
-      <td><?= p::clean($item->description) ?></td>
-    </tr>
+<ul class="gMetadata">
+  <li>
+    <strong class="caption"><?= t("Title:") ?></strong>
+    <?= p::clean($item->title) ?>
+  </li>
+  <? if ($item->description): ?>
+  <li>
+    <strong class="caption"><?= t("Description:") ?></strong>
+    <?= p::clean($item->description) ?>
+  </li>
+  <? endif ?>
+  <? if ($item->id != 1): ?>
+  <li>
+    <strong class="caption"><?= t("Folder name:") ?></strong>
+    <?= p::clean($item->name) ?>
+  </li>
+  <? endif ?>
+  <? if ($item->captured): ?>
+  <li>
+    <strong class="caption"><?= t("Captured:") ?></strong>
+    <?= date("M j, Y H:i:s", $item->captured)?>
+  </li>
+  <? endif ?>
+  <? if ($item->owner): ?>
+  <li>
+    <strong class="caption"><?= t("Owner:") ?></strong>
+    <? if ($item->owner->url): ?>
+    <a href="<?= $item->owner->url ?>"><?= p::clean($item->owner->full_name) ?></a>
+    <? else: ?>
+    <?= p::clean($item->owner->name) ?>
     <? endif ?>
-    <? if ($item->id != 1): ?>
-    <tr>
-      <th><?= t("Name:") ?></th>
-      <td><?= p::clean($item->name) ?></td>
-    </tr>
-    <? endif ?>
-    <? if ($item->id != 1): ?>
-    <? $parent = $item->parent(); ?>
-    <tr>
-      <th><?= t("Album: ") ?></th>
-      <td>
-        <a href="<?= url::site("albums/{$parent->id}?show=$item->id") ?>">
-          <?= p::clean($parent->title) ?>
-        </a>
-      </td>
-    </tr>
-    <? endif ?>
-    <? if ($item->captured): ?>
-    <tr>
-      <th><?= t("Captured:") ?></th>
-      <td><?= gallery::date_time($item->captured) ?></td>
-    </tr>
-    <? endif ?>
-    <? if ($item->owner): ?>
-    <tr>
-      <th><?= t("Owner:") ?></th>
-      <td><a href="#"><?= p::clean($item->owner->name) ?></a></td>
-    </tr>
-    <? endif ?>
-  </tbody>
-</table>
+  </li>
+  <? endif ?>
+</ul>
\ No newline at end of file
diff --git a/themes/default/css/screen.css b/themes/default/css/screen.css
index d3c4de6f..e37de70e 100644
--- a/themes/default/css/screen.css
+++ b/themes/default/css/screen.css
@@ -57,6 +57,10 @@ h2 {
   font-size: 1.2em;
 }
 
+#gSidebar .gBlock li {
+  margin-bottom: .6em;
+}
+
 h3 {
   font-size: 1.2em;
 }
-- 
cgit v1.2.3


From c4f991bb7d7e90f8c55897f89888d9196c7e438f Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 28 Jun 2009 19:45:11 -0700
Subject: Clean up the combined javascript change and refactor out the
 Gallery_View base class from Theme_View and Admin_View.

1) Move all the theme specific jquery stuff from gallery_theme::head()
and admin_head() into the theme files.  Use $theme->script() as
appropriate.

2) Get rid of the extra boolean on $theme->url() that we were using so
that we could call $theme->script($theme->url(...)) -- add
$theme->theme_script() instead (poorly named, but still clearer than
what we had before)

3) Fix the bug that combined scripts didn't work at all in the admin
theme.

4) Get rid of $theme->display() in favor of new View(...)
---
 modules/gallery/helpers/gallery_theme.php  | 24 --------
 modules/gallery/libraries/Admin_View.php   | 17 ++----
 modules/gallery/libraries/Gallery_View.php | 89 ++++++++++++++++++++++++++++++
 modules/gallery/libraries/Theme_View.php   | 61 +-------------------
 themes/admin_default/views/admin.html.php  | 10 ++++
 themes/default/views/page.html.php         | 24 +++++++-
 6 files changed, 128 insertions(+), 97 deletions(-)
 create mode 100644 modules/gallery/libraries/Gallery_View.php

(limited to 'themes')

diff --git a/modules/gallery/helpers/gallery_theme.php b/modules/gallery/helpers/gallery_theme.php
index b6b24b27..cffecb12 100644
--- a/modules/gallery/helpers/gallery_theme.php
+++ b/modules/gallery/helpers/gallery_theme.php
@@ -21,22 +21,6 @@ class gallery_theme_Core {
   static function head($theme) {
     $session = Session::instance();
     $buf = "";
-    $theme->script("lib/jquery.js");
-    $theme->script("lib/jquery.form.js");
-    $theme->script("lib/jquery-ui.js");
-    $theme->script("lib/gallery.common.js");
-    $theme->script("lib/gallery.dialog.js");
-    $theme->script("lib/gallery.form.js");
-    $theme->script("lib/superfish/js/superfish.js");
-    if ($theme->page_type == 'photo') {
-      $theme->script("lib/jquery.scrollTo.js");
-      $theme->script("lib/jquery.localscroll.js");
-      $theme->script("lib/gallery.show_full_size.js");
-    }
-    if ($theme->page_type == 'movie') {
-      $theme->script("lib/flowplayer.js");
-    }
-    $theme->script($theme->url("js/ui.init.js", false, true));
     if ($session->get("debug")) {
       $buf .= "<link rel=\"stylesheet\" type=\"text/css\" href=\"" .
         url::file("modules/gallery/css/debug.css") . "\" />";
@@ -95,14 +79,6 @@ class gallery_theme_Core {
   static function admin_head($theme) {
     $session = Session::instance();
     $buf = "";
-    $theme->script("lib/jquery.js");
-    $theme->script("lib/jquery.form.js");
-    $theme->script("lib/jquery-ui.js");
-    $theme->script("lib/gallery.common.js");
-    $theme->script("lib/gallery.dialog.js");
-    $theme->script("lib/superfish/js/superfish.js");
-    $theme->script($theme->url("js/jquery.dropshadow.js", false, true));
-    $theme->script($theme->url("js/ui.init.js", false, true));
     if ($session->get("debug")) {
       $buf .= "<link rel=\"stylesheet\" type=\"text/css\" href=\"" .
         url::file("modules/gallery/css/debug.css") . "\" />";
diff --git a/modules/gallery/libraries/Admin_View.php b/modules/gallery/libraries/Admin_View.php
index 7a7396eb..01496c0d 100644
--- a/modules/gallery/libraries/Admin_View.php
+++ b/modules/gallery/libraries/Admin_View.php
@@ -17,9 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
-class Admin_View_Core extends View {
-  private $theme_name = null;
-
+class Admin_View_Core extends Gallery_View {
   /**
    * Attempts to load a view and pre-load view data.
    *
@@ -46,15 +44,6 @@ class Admin_View_Core extends View {
     $this->set_global("user", user::active());
   }
 
-  public function url($path, $absolute_url=false) {
-    $arg = "themes/{$this->theme_name}/$path";
-    return $absolute_url ? url::abs_file($arg) : url::file($arg);
-  }
-
-  public function display($page_name, $view_class="View") {
-    return new $view_class($page_name);
-  }
-
   public function admin_menu() {
     $menu = Menu::factory("root");
     gallery_menu::admin($menu, $this);
@@ -109,6 +98,10 @@ class Admin_View_Core extends View {
         }
       }
 
+      if ($function == "admin_head") {
+        array_unshift($blocks, $this->combine_script());
+      }
+
       if (Session::instance()->get("debug")) {
         if ($function != "admin_head") {
           array_unshift(
diff --git a/modules/gallery/libraries/Gallery_View.php b/modules/gallery/libraries/Gallery_View.php
new file mode 100644
index 00000000..f2298b7d
--- /dev/null
+++ b/modules/gallery/libraries/Gallery_View.php
@@ -0,0 +1,89 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+/**
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2000-2009 Bharat Mediratta
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+class Gallery_View_Core extends View {
+  protected $theme_name = null;
+  protected $scripts = array();
+
+  /**
+   * Add a script to the combined scripts list.
+   * @param $file  the relative path to a script from the gallery3 directory
+   */
+  public function script($file, $theme_relative=false) {
+    $this->scripts[$file] = 1;
+  }
+
+  /**
+   * Add a script to the combined scripts list.
+   * @param $file  the relative path to a script from the base of the active theme
+   * @param
+   */
+  public function theme_script($file) {
+    $file = "themes/{$this->theme_name}/$file";
+    $this->scripts[$file] = 1;
+  }
+
+  /**
+   * Provide a url to a resource within the current theme.  This allows us to refer to theme
+   * resources without naming the theme itself which makes themes easier to copy.
+   */
+  public function url($path, $absolute_url=false) {
+    $arg = "themes/{$this->theme_name}/$path";
+    return $absolute_url ? url::abs_file($arg) : url::file($arg);
+  }
+
+  /**
+   * Combine a series of Javascript files into a single one and cache it in the database, then
+   * return a single <script> element to refer to it.
+   */
+  protected function combine_script() {
+    $links = array();
+    $key = "";
+    foreach (array_keys($this->scripts) as $file) {
+      $path = DOCROOT . $file;
+      if (file_exists($path)) {
+        $stats = stat($path);
+        $links[] = $path;
+        // 7 == size, 9 == mtime, see http://php.net/stat
+        $key = "{$key}$file $stats[7] $stats[9],";
+      } else {
+        Kohana::log("alert", "Javascript file missing: " . $file);
+      }
+    }
+
+    $key = md5($key);
+    $cache = Cache::instance();
+    $contents = $cache->get($key);
+    if (empty($contents)) {
+      $contents = "";
+      foreach ($links as $link) {
+        $contents .= file_get_contents($link);
+      }
+      $cache->set($key, $contents, array("javascript"), 30 * 84600);
+      if (function_exists("gzencode")) {
+        $cache->set("{$key}_gz", gzencode($contents, 9, FORCE_GZIP),
+                    array("javascript", "gzip"), 30 * 84600);
+      }
+    }
+
+    // Handcraft the script link because html::script will add a .js extenstion
+    return "<script type=\"text/javascript\" src=\"" . url::site("combined/javascript/$key") .
+      "\"></script>";
+  }
+}
\ No newline at end of file
diff --git a/modules/gallery/libraries/Theme_View.php b/modules/gallery/libraries/Theme_View.php
index 25818821..8e320f44 100644
--- a/modules/gallery/libraries/Theme_View.php
+++ b/modules/gallery/libraries/Theme_View.php
@@ -17,10 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
-class Theme_View_Core extends View {
-  private $theme_name = null;
-  private $scripts = array();
-
+class Theme_View_Core extends Gallery_View {
   /**
    * Attempts to load a view and pre-load view data.
    *
@@ -69,11 +66,6 @@ class Theme_View_Core extends View {
     return module::get_var("gallery", "thumb_size", 200) / 200;
   }
 
-  public function url($path, $absolute_url=false, $no_root=false) {
-    $arg = "themes/{$this->theme_name}/$path";
-    return $absolute_url ? url::abs_file($arg) : $no_root ? $arg : url::file($arg);
-  }
-
   public function item() {
     return $this->item;
   }
@@ -86,10 +78,6 @@ class Theme_View_Core extends View {
     return $this->page_type;
   }
 
-  public function display($page_name, $view_class="View") {
-    return new $view_class($page_name);
-  }
-
   public function site_menu() {
     $menu = Menu::factory("root");
     if ($this->page_type != "login") {
@@ -168,49 +156,6 @@ class Theme_View_Core extends View {
     return message::get();
   }
 
-  public function script($file) {
-    $this->scripts[$file] = 1;
-  }
-
-  /**
-   * Combine a series of Javascript files into a single one and cache it in the database, then
-   * return a single <script> element to refer to it.
-   */
-  private function _combine_script() {
-    $links = array();
-    $key = "";
-    foreach (array_keys($this->scripts) as $file) {
-      $path = DOCROOT . $file;
-      if (file_exists($path)) {
-        $stats = stat($path);
-        $links[] = $path;
-        // 7 == size, 9 == mtime, see http://php.net/stat
-        $key = "{$key}$file $stats[7] $stats[9],";
-      } else {
-        Kohana::log("warn", "Javascript file missing: " . $file);
-      }
-    }
-
-    $key = md5($key);
-    $cache = Cache::instance();
-    $contents = $cache->get($key);
-    if (empty($contents)) {
-      $contents = "";
-      foreach ($links as $link) {
-        $contents .= file_get_contents($link);
-      }
-      $cache->set($key, $contents, array("javascript"), 30 * 84600);
-      if (function_exists("gzencode")) {
-        $cache->set("{$key}_gz", gzencode($contents, 9, FORCE_GZIP),
-                    array("javascript", "gzip"), 30 * 84600);
-      }
-    }
-
-    // Handcraft the script link because html::script will add a .js extenstion
-    return "<script type=\"text/javascript\" src=\"" . url::site("combined/javascript/$key") .
-      "\"></script>";
-  }
-
   /**
    * Handle all theme functions that insert module content.
    */
@@ -270,8 +215,8 @@ class Theme_View_Core extends View {
         }
       }
 
-      if ($function == "head" || $function == "admin_head") {
-        array_unshift($blocks, $this->_combine_script());
+      if ($function == "head") {
+        array_unshift($blocks, $this->combine_script());
       }
 
       if (Session::instance()->get("debug")) {
diff --git a/themes/admin_default/views/admin.html.php b/themes/admin_default/views/admin.html.php
index dfbafe31..2a91a76c 100644
--- a/themes/admin_default/views/admin.html.php
+++ b/themes/admin_default/views/admin.html.php
@@ -20,6 +20,16 @@
     <link rel="stylesheet" type="text/css" href="<?= $theme->url("css/fix-ie.css") ?>"
         media="screen,print,projection" />
    <![endif]-->
+
+   <?= $theme->script("lib/jquery.js") ?>
+   <?= $theme->script("lib/jquery.form.js") ?>
+   <?= $theme->script("lib/jquery-ui.js") ?>
+   <?= $theme->script("lib/gallery.common.js") ?>
+   <?= $theme->script("lib/gallery.dialog.js") ?>
+   <?= $theme->script("lib/superfish/js/superfish.js") ?>
+   <?= $theme->theme_script("js/jquery.dropshadow.js") ?>
+   <?= $theme->theme_script("js/ui.init.js") ?>
+
    <?= $theme->admin_head() ?>
   </head>
 
diff --git a/themes/default/views/page.html.php b/themes/default/views/page.html.php
index c74d4097..8b9466ac 100644
--- a/themes/default/views/page.html.php
+++ b/themes/default/views/page.html.php
@@ -49,6 +49,24 @@
     </style>
       <? endif ?>
     <? endif ?>
+    <?= $theme->script("lib/jquery.js") ?>
+    <?= $theme->script("lib/jquery.form.js") ?>
+    <?= $theme->script("lib/jquery-ui.js") ?>
+    <?= $theme->script("lib/gallery.common.js") ?>
+    <?= $theme->script("lib/gallery.dialog.js") ?>
+    <?= $theme->script("lib/gallery.form.js") ?>
+    <?= $theme->script("lib/superfish/js/superfish.js") ?>
+    <?= $theme->script("lib/jquery.localscroll.js") ?>
+    <?= $theme->theme_script("js/ui.init.js") ?>
+
+    <? /* These are page specific, but if we put them before $theme->head() they get combined */ ?>
+    <? if ($theme->page_type == "photo"): ?>
+    <?= $theme->script("lib/jquery.scrollTo.js") ?>
+    <?= $theme->script("lib/gallery.show_full_size.js") ?>
+    <? elseif ($theme->page_type == "movie"): ?>
+    <?= $theme->script("lib/flowplayer.js") ?>
+    <? endif ?>
+
     <?= $theme->head() ?>
   </head>
 
@@ -57,7 +75,7 @@
     <div id="doc4" class="yui-t5 gView">
       <?= $theme->site_status() ?>
       <div id="gHeader">
-        <?= $theme->display("header.html") ?>
+        <?= new View("header.html") ?>
       </div>
       <div id="bd">
         <div id="yui-main">
@@ -70,12 +88,12 @@
         </div>
         <div id="gSidebar" class="yui-b">
           <? if ($theme->page_type != "login"): ?>
-          <?= $theme->display("sidebar.html") ?>
+          <?= new View("sidebar.html") ?>
           <? endif ?>
         </div>
       </div>
       <div id="gFooter">
-        <?= $theme->display("footer.html") ?>
+        <?= new View("footer.html") ?>
       </div>
     </div>
     <?= $theme->page_bottom() ?>
-- 
cgit v1.2.3


From 6e8a8c53e685a6c3f35f1426ab4dd6dcc18578e0 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 28 Jun 2009 19:49:48 -0700
Subject: Rename $theme->url() to $theme->theme_url() for consistency wiht
 $theme->theme_script().

---
 modules/comment/views/admin_block_recent_comments.html.php | 2 +-
 modules/comment/views/admin_comments.html.php              | 2 +-
 modules/comment/views/comment.html.php                     | 2 +-
 modules/comment/views/comments.html.php                    | 2 +-
 modules/gallery/libraries/Gallery_View.php                 | 2 +-
 modules/user/views/admin_users.html.php                    | 2 +-
 themes/admin_default/views/admin.html.php                  | 4 ++--
 themes/default/views/header.html.php                       | 2 +-
 themes/default/views/page.html.php                         | 6 +++---
 9 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'themes')

diff --git a/modules/comment/views/admin_block_recent_comments.html.php b/modules/comment/views/admin_block_recent_comments.html.php
index edaa19ae..af4d946e 100644
--- a/modules/comment/views/admin_block_recent_comments.html.php
+++ b/modules/comment/views/admin_block_recent_comments.html.php
@@ -2,7 +2,7 @@
 <ul>
   <? foreach ($comments as $i => $comment): ?>
   <li class="<?= ($i % 2 == 0) ? "gEvenRow" : "gOddRow" ?>">
-    <img src="<?= $comment->author()->avatar_url(32, $theme->url("images/avatar.jpg", true)) ?>"
+    <img src="<?= $comment->author()->avatar_url(32, $theme->theme_url("images/avatar.jpg", true)) ?>"
          class="gAvatar"
          alt="<?= p::clean($comment->author_name()) ?>"
          width="32"
diff --git a/modules/comment/views/admin_comments.html.php b/modules/comment/views/admin_comments.html.php
index 86585c65..453cf849 100644
--- a/modules/comment/views/admin_comments.html.php
+++ b/modules/comment/views/admin_comments.html.php
@@ -106,7 +106,7 @@
     <tr id="gComment-<?= $comment->id ?>" class="<?= ($i % 2 == 0) ? "gEvenRow" : "gOddRow" ?>">
       <td>
         <a href="#">
-          <img src="<?= $comment->author()->avatar_url(40, $theme->url("images/avatar.jpg", true)) ?>"
+          <img src="<?= $comment->author()->avatar_url(40, $theme->theme_url("images/avatar.jpg", true)) ?>"
                class="gAvatar"
                alt="<?= p::clean($comment->author_name()) ?>"
                width="40"
diff --git a/modules/comment/views/comment.html.php b/modules/comment/views/comment.html.php
index ce52951b..6d2cc592 100644
--- a/modules/comment/views/comment.html.php
+++ b/modules/comment/views/comment.html.php
@@ -2,7 +2,7 @@
 <li id="gComment-<?= $comment->id; ?>">
   <p class="gAuthor">
     <a href="#">
-      <img src="<?= $comment->author()->avatar_url(40, $theme->url("images/avatar.jpg", true)) ?>"
+      <img src="<?= $comment->author()->avatar_url(40, $theme->theme_url("images/avatar.jpg", true)) ?>"
            class="gAvatar"
            alt="<?= p::clean($comment->author_name()) ?>"
            width="40"
diff --git a/modules/comment/views/comments.html.php b/modules/comment/views/comments.html.php
index 854f9554..d9405e5f 100644
--- a/modules/comment/views/comments.html.php
+++ b/modules/comment/views/comments.html.php
@@ -10,7 +10,7 @@
   <li id="gComment-<?= $comment->id ?>">
     <p class="gAuthor">
       <a href="#">
-        <img src="<?= $comment->author()->avatar_url(40, $theme->url("images/avatar.jpg", true)) ?>"
+        <img src="<?= $comment->author()->avatar_url(40, $theme->theme_url("images/avatar.jpg", true)) ?>"
              class="gAvatar"
              alt="<?= p::clean($comment->author_name()) ?>"
              width="40"
diff --git a/modules/gallery/libraries/Gallery_View.php b/modules/gallery/libraries/Gallery_View.php
index f2298b7d..e21e83d8 100644
--- a/modules/gallery/libraries/Gallery_View.php
+++ b/modules/gallery/libraries/Gallery_View.php
@@ -43,7 +43,7 @@ class Gallery_View_Core extends View {
    * Provide a url to a resource within the current theme.  This allows us to refer to theme
    * resources without naming the theme itself which makes themes easier to copy.
    */
-  public function url($path, $absolute_url=false) {
+  public function theme_url($path, $absolute_url=false) {
     $arg = "themes/{$this->theme_name}/$path";
     return $absolute_url ? url::abs_file($arg) : url::file($arg);
   }
diff --git a/modules/user/views/admin_users.html.php b/modules/user/views/admin_users.html.php
index 542b8b8b..b469f82d 100644
--- a/modules/user/views/admin_users.html.php
+++ b/modules/user/views/admin_users.html.php
@@ -66,7 +66,7 @@
       <? foreach ($users as $i => $user): ?>
       <tr id="gUser-<?= $user->id ?>" class="<?= text::alternate("gOddRow", "gEvenRow") ?> user <?= $user->admin ? "admin" : "" ?>">
         <td id="user-<?= $user->id ?>" class="core-info gDraggable">
-          <img src="<?= $user->avatar_url(20, $theme->url("images/avatar.jpg", true)) ?>"
+          <img src="<?= $user->avatar_url(20, $theme->theme_url("images/avatar.jpg", true)) ?>"
                title="<?= t("Drag user onto group below to add as a new member") ?>"
                alt="<?= p::clean($user->name) ?>"
                width="20"
diff --git a/themes/admin_default/views/admin.html.php b/themes/admin_default/views/admin.html.php
index 2a91a76c..62f9761f 100644
--- a/themes/admin_default/views/admin.html.php
+++ b/themes/admin_default/views/admin.html.php
@@ -14,10 +14,10 @@
         media="screen,projection" />
     <link rel="stylesheet" type="text/css" href="<?= url::file("themes/default/css/screen.css") ?>"
         media="screen,projection" />
-    <link rel="stylesheet" type="text/css" href="<?= $theme->url("css/screen.css") ?>"
+    <link rel="stylesheet" type="text/css" href="<?= $theme->theme_url("css/screen.css") ?>"
         media="screen,projection" />
    <!--[if IE]>
-    <link rel="stylesheet" type="text/css" href="<?= $theme->url("css/fix-ie.css") ?>"
+    <link rel="stylesheet" type="text/css" href="<?= $theme->theme_url("css/fix-ie.css") ?>"
         media="screen,print,projection" />
    <![endif]-->
 
diff --git a/themes/default/views/header.html.php b/themes/default/views/header.html.php
index e1e52bda..b38cffed 100644
--- a/themes/default/views/header.html.php
+++ b/themes/default/views/header.html.php
@@ -4,7 +4,7 @@
 <?= $header_text ?>
 <? else: ?>
 <a href="<?= url::site("albums/1") ?>">
-  <img width="107" height="48" id="gLogo" alt="<?= t("Gallery: Your photos on your web site") ?>" src="<?= $theme->url("images/logo.png") ?>" />
+  <img width="107" height="48" id="gLogo" alt="<?= t("Gallery: Your photos on your web site") ?>" src="<?= $theme->theme_url("images/logo.png") ?>" />
 </a>
 <? endif ?>
 
diff --git a/themes/default/views/page.html.php b/themes/default/views/page.html.php
index 8b9466ac..3ae3e155 100644
--- a/themes/default/views/page.html.php
+++ b/themes/default/views/page.html.php
@@ -23,17 +23,17 @@
         <? endif ?>
       <? endif ?>
     </title>
-    <link rel="shortcut icon" href="<?= $theme->url("images/favicon.ico") ?>" type="image/x-icon" />
+    <link rel="shortcut icon" href="<?= $theme->theme_url("images/favicon.ico") ?>" type="image/x-icon" />
     <link rel="stylesheet" type="text/css" href="<?= url::file("lib/yui/reset-fonts-grids.css") ?>"
           media="screen,print,projection" />
     <link rel="stylesheet" type="text/css" href="<?= url::file("lib/superfish/css/superfish.css") ?>"
           media="screen" />
     <link rel="stylesheet" type="text/css" href="<?= url::file("lib/themeroller/ui.base.css") ?>"
           media="screen,print,projection" />
-    <link rel="stylesheet" type="text/css" href="<?= $theme->url("css/screen.css") ?>"
+    <link rel="stylesheet" type="text/css" href="<?= $theme->theme_url("css/screen.css") ?>"
           media="screen,print,projection" />
     <!--[if lt IE 8]>
-    <link rel="stylesheet" type="text/css" href="<?= $theme->url("css/fix-ie.css") ?>"
+    <link rel="stylesheet" type="text/css" href="<?= $theme->theme_url("css/fix-ie.css") ?>"
           media="screen,print,projection" />
     <![endif]-->
     <? if ($theme->page_type == 'album'): ?>
-- 
cgit v1.2.3