From 39cf3c2b046b03691937e112268403130508da63 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Sun, 21 Jun 2009 08:52:26 -0700
Subject: The start of the digibug printing module.  The first cut at the
 administration  panels.  <Caution:> This is still a work in progress.

---
 modules/digibug/helpers/digibug_theme.php | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 modules/digibug/helpers/digibug_theme.php

(limited to 'modules/digibug/helpers/digibug_theme.php')

diff --git a/modules/digibug/helpers/digibug_theme.php b/modules/digibug/helpers/digibug_theme.php
new file mode 100644
index 00000000..06d656c8
--- /dev/null
+++ b/modules/digibug/helpers/digibug_theme.php
@@ -0,0 +1,25 @@
+<?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 digibug_theme_Core {
+  static function admin_head($theme) {
+    return "<link media=\"screen, projection\" rel=\"stylesheet\" type=\"text/css\" href=\"" .
+      url::file("modules/digibug/css/digibug.css") . "\" />";
+  }
+}
-- 
cgit v1.2.3


From 58d5624e401f1c369cbbf913008775bc5a165570 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Mon, 22 Jun 2009 21:51:22 -0700
Subject: This commit moves a little further along the path: 1) moves the print
 button from the quick pane to thumb_bottom 2) Creates an entry into the proxy
 table

---
 modules/digibug/controllers/digibug.php       | 64 ++++++++++++++++++---------
 modules/digibug/css/digibug.css               |  3 ++
 modules/digibug/helpers/digibug.php           | 57 ++++++++++++++++++++++++
 modules/digibug/helpers/digibug_installer.php |  6 +--
 modules/digibug/helpers/digibug_quick.php     | 34 --------------
 modules/digibug/helpers/digibug_theme.php     | 23 ++++++++++
 modules/digibug/js/digibug.js                 | 24 ++++++++++
 modules/digibug/models/proxy.php              | 22 +++++++++
 8 files changed, 175 insertions(+), 58 deletions(-)
 create mode 100644 modules/digibug/helpers/digibug.php
 delete mode 100644 modules/digibug/helpers/digibug_quick.php
 create mode 100644 modules/digibug/js/digibug.js
 create mode 100644 modules/digibug/models/proxy.php

(limited to 'modules/digibug/helpers/digibug_theme.php')

diff --git a/modules/digibug/controllers/digibug.php b/modules/digibug/controllers/digibug.php
index f2f3d6cd..f90b88e2 100644
--- a/modules/digibug/controllers/digibug.php
+++ b/modules/digibug/controllers/digibug.php
@@ -18,35 +18,57 @@
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
 class Digibug_Controller extends Controller {
-  public function index() {
-    print $this->_get_form();
-  }
-
-  public function handler() {
+  public function print_photo($id) {
     access::verify_csrf();
 
-    $form = $this->_get_form();
-    if ($form->validate()) {
-      // @todo process the admin form
+    $item = ORM::factory("item", $id);
 
-      message::success(t("Digibug Processing Successfully"));
+    $proxy = ORM::factory("proxy");
+    $proxy->uuid = digibug::uuid();
+    $proxy->item_id = $item->id;
+    $proxy->save();
 
-      print json_encode(
-        array("result" => "success"));
+    $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 {
-      print json_encode(
-        array("result" => "error",
-              "form" => $form->__toString()));
+      $company_id = module::get_var("digibug", "company_id");
+      $event_id = module::get_var("digibug", "event_id");
     }
+    $digibug_parms = array(
+      "digibug_api_version" => "100",
+      "company_id" => $company_id,
+      "event_id" => $event_id,
+      "cmd" => "adding",
+      "return_url" => url::abs_site($this->input->get("return")),
+      "num_images" => "1",
+      "image_1" => $url,
+      "thumb_1" => "$url/thumb",
+      "image_height_1" => $item->height,
+      "image_width_1" => $item->width,
+      "thumb_height_1" => $item->thumb_height,
+      "thumb_width_1" => $item->thumb_width,
+      "title" => $item->title);
+
+    Kohana::log("error", Kohana::debug($digibug_parms));
+
+    message::success(
+      t("Photo '%title' was submitted for printing.", array("title" => $item->title)));
+    print json_encode(array("result" => "success", "reload" => 1));
   }
 
-  private function _get_form() {
-    $form = new Forge("digibug/handler", "", "post",
-                      array("id" => "gDigibugForm"));
-    $group = $form->group("group")->label(t("Digibug Handler"));
-    $group->input("text")->label(t("Text"))->rules("required");
-    $group->submit("submit")->value(t("Submit"));
+  public function print_proxy($id, $thumb=null) {
+
+    // We don't need to save the session for this request
+    Session::abort_save();
 
-    return $form;
+    // Dump out the image
+    header("Content-Type: $item->mime_type");
+    Kohana::close_buffers(false);
+    $fd = fopen($file, "rb");
+    fpassthru($fd);
+    fclose($fd);
   }
+
 }
\ No newline at end of file
diff --git a/modules/digibug/css/digibug.css b/modules/digibug/css/digibug.css
index f5cd6717..a09e4551 100644
--- a/modules/digibug/css/digibug.css
+++ b/modules/digibug/css/digibug.css
@@ -84,5 +84,8 @@
   width: 180px;
 }
 
+.gDigibugPrintButton {
+  float: left;
+}
 
 
diff --git a/modules/digibug/helpers/digibug.php b/modules/digibug/helpers/digibug.php
new file mode 100644
index 00000000..46c9d945
--- /dev/null
+++ b/modules/digibug/helpers/digibug.php
@@ -0,0 +1,57 @@
+<?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 digibug_Core {
+  /**
+   * Get a unique id for a print request.
+   * Its a good thing we only support linux as this won't work on Windows
+   */
+  static function uuid() {
+    $fp = @fopen("/dev/urandom", "rb");
+    $bits = @fread($fp, 16);
+    @fclose($fp);
+
+    $time_low = bin2hex(substr($bits, 0, 4));
+    $time_mid = bin2hex(substr($bits, 4, 2));
+    $time_hi_and_version = bin2hex(substr($bits, 6, 2));
+    $clock_seq_hi_and_reserved = bin2hex(substr($bits, 8, 2));
+    $node = bin2hex ( substr ( $bits, 10, 6 ) );
+
+    /**
+     * Set the four most significant bits (bits 12 through 15) of the
+     * time_hi_and_version field to the 4-bit version number from
+     * Section 4.1.3.
+     * @see http://tools.ietf.org/html/rfc4122#section-4.1.3
+     */
+    $time_hi_and_version = hexdec ( $time_hi_and_version );
+    $time_hi_and_version = $time_hi_and_version >> 4;
+    $time_hi_and_version = $time_hi_and_version | 0x4000;
+
+    /**
+     * Set the two most significant bits (bits 6 and 7) of the
+     * clock_seq_hi_and_reserved to zero and one, respectively.
+     */
+    $clock_seq_hi_and_reserved = hexdec ( $clock_seq_hi_and_reserved );
+    $clock_seq_hi_and_reserved = $clock_seq_hi_and_reserved >> 2;
+    $clock_seq_hi_and_reserved = $clock_seq_hi_and_reserved | 0x8000;
+
+    return sprintf ('%08s-%04s-%04x-%04x-%012s',
+                    $time_low, $time_mid, $time_hi_and_version, $clock_seq_hi_and_reserved, $node);
+  }
+}
diff --git a/modules/digibug/helpers/digibug_installer.php b/modules/digibug/helpers/digibug_installer.php
index 33b5107b..73645eb7 100644
--- a/modules/digibug/helpers/digibug_installer.php
+++ b/modules/digibug/helpers/digibug_installer.php
@@ -22,9 +22,9 @@ class digibug_installer {
     $version = module::get_version("digibug");
     if ($version == 0) {
       Database::instance()
-        ->query("CREATE TABLE {print_proxy} (
+        ->query("CREATE TABLE {proxies} (
                    `id` int(9) NOT NULL auto_increment,
-                   `proxy_id` char(55) NOT NULL,
+                   `uuid` char(32) NOT NULL,
                    `item_id` int(9),
                    PRIMARY KEY (`id`))
                  ENGINE=InnoDB DEFAULT CHARSET=utf8;");
@@ -38,7 +38,7 @@ class digibug_installer {
   }
 
   static function uninstall() {
-    Database::instance()->query("DROP TABLE IF EXISTS {print_proxy}");
+    Database::instance()->query("DROP TABLE IF EXISTS {proxys}");
     module::delete("digibug");
   }
 }
diff --git a/modules/digibug/helpers/digibug_quick.php b/modules/digibug/helpers/digibug_quick.php
deleted file mode 100644
index dce0c519..00000000
--- a/modules/digibug/helpers/digibug_quick.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?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 digibug_quick_Core {
-  static function buttons($item, $page_type) {
-    $elements["center"] = array();
-    if (access::can("view", $item) && $item->type == "photo") {
-      $csrf = access::csrf_token();
-      $elements["center"][] = (object)array(
-        "title" => t("Print photo with Digibug"),
-        "class" => "gButtonLink",
-        "icon" => "ui-icon-print",
-        "href" => url::site("digibug/print/$item->id?csrf=$csrf"));
-    }
-
-    return $elements;
-  }
-}
diff --git a/modules/digibug/helpers/digibug_theme.php b/modules/digibug/helpers/digibug_theme.php
index 06d656c8..2e44b115 100644
--- a/modules/digibug/helpers/digibug_theme.php
+++ b/modules/digibug/helpers/digibug_theme.php
@@ -18,8 +18,31 @@
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
 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") . "\" />";
   }
+
+  static function thumb_bottom($theme, $child) {
+    if ($theme->page_type() == "album" && $child->type == "photo") {
+      $csrf = access::csrf_token();
+      $return = "album/{$child->parent()->id}";
+      $href = url::site("digibug/print_photo/$child->id?csrf={$csrf}&return=$return");
+      $title = t("Print photo with Digibug");
+      return "<div class=\"gDigibugPrintButton\">
+                <a class=\"gButtonLink ui-corner-all ui-state-default ui-icon-left\" href=\"$href\"
+                   title=\"$title\">
+                  <span class=\"ui-icon ui-icon-print\">$title</span>
+                </a>
+             </div>";
+    }
+    return "";
+  }
 }
diff --git a/modules/digibug/js/digibug.js b/modules/digibug/js/digibug.js
new file mode 100644
index 00000000..f30678c0
--- /dev/null
+++ b/modules/digibug/js/digibug.js
@@ -0,0 +1,24 @@
+$(document).ready(function() {
+  $(".gDigibugPrintButton a").click(function(e) {
+    e.preventDefault();
+    queue_print(e);
+  });
+});
+
+function queue_print(e) {
+  var parent = e.currentTarget.parentNode;
+  $(parent).addClass("gLoadingLarge");
+  $.ajax({
+    type: "GET",
+    url: e.currentTarget.href,
+    dataType: "json",
+    success: function(data) {
+      $(parent).removeClass("gLoadingLarge");
+      if (data.location) {
+        window.location = data.location;
+      } else if (data.reload) {
+        window.location.reload();
+      }
+    }
+  });
+};
diff --git a/modules/digibug/models/proxy.php b/modules/digibug/models/proxy.php
new file mode 100644
index 00000000..ce10c592
--- /dev/null
+++ b/modules/digibug/models/proxy.php
@@ -0,0 +1,22 @@
+<?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 Proxy_Model extends ORM {
+  protected $has_one = array("item");
+}
-- 
cgit v1.2.3


From 8f443cef3e304c12f9e3555332880395051e7e3d Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Tue, 23 Jun 2009 06:06:33 -0700
Subject: This change implements the print_proxy method.  This method allows a
 1 time security bypass for the remote print processor to retrieve the
 fullsize image.

---
 modules/digibug/controllers/digibug.php   | 25 ++++++++++++++++++++++---
 modules/digibug/helpers/digibug_theme.php | 15 +++++----------
 2 files changed, 27 insertions(+), 13 deletions(-)

(limited to 'modules/digibug/helpers/digibug_theme.php')

diff --git a/modules/digibug/controllers/digibug.php b/modules/digibug/controllers/digibug.php
index f90b88e2..b0807aa5 100644
--- a/modules/digibug/controllers/digibug.php
+++ b/modules/digibug/controllers/digibug.php
@@ -51,24 +51,43 @@ class Digibug_Controller extends Controller {
       "thumb_width_1" => $item->thumb_width,
       "title" => $item->title);
 
-    Kohana::log("error", Kohana::debug($digibug_parms));
-
     message::success(
       t("Photo '%title' was submitted for printing.", array("title" => $item->title)));
     print json_encode(array("result" => "success", "reload" => 1));
   }
 
   public function print_proxy($id, $thumb=null) {
+    $proxy = ORM::factory("proxy")
+      ->where("uuid", $id)
+      ->find();
+
+    if (!$proxy->loaded) {
+      Kohana::show_404();
+    }
+
+    if (!$proxy->item->loaded) {
+      Kohana::show_404();
+    }
+
+    $file = empty($thumb) ? $proxy->item->file_path() : $proxy->item->thumb_path();
+    if (!file_exists($file)) {
+      kohana::show_404();
+    }
 
     // We don't need to save the session for this request
     Session::abort_save();
 
     // Dump out the image
-    header("Content-Type: $item->mime_type");
+    header("Content-Type: $proxy->item->mime_type");
     Kohana::close_buffers(false);
     $fd = fopen($file, "rb");
     fpassthru($fd);
     fclose($fd);
+
+    // If the request was for the image and not the thumb, then delete the proxy.
+    if (empty($thumb)) {
+      $proxy->delete();
+    }
   }
 
 }
\ No newline at end of file
diff --git a/modules/digibug/helpers/digibug_theme.php b/modules/digibug/helpers/digibug_theme.php
index 2e44b115..0fe2ce2e 100644
--- a/modules/digibug/helpers/digibug_theme.php
+++ b/modules/digibug/helpers/digibug_theme.php
@@ -32,16 +32,11 @@ class digibug_theme_Core {
 
   static function thumb_bottom($theme, $child) {
     if ($theme->page_type() == "album" && $child->type == "photo") {
-      $csrf = access::csrf_token();
-      $return = "album/{$child->parent()->id}";
-      $href = url::site("digibug/print_photo/$child->id?csrf={$csrf}&return=$return");
-      $title = t("Print photo with Digibug");
-      return "<div class=\"gDigibugPrintButton\">
-                <a class=\"gButtonLink ui-corner-all ui-state-default ui-icon-left\" href=\"$href\"
-                   title=\"$title\">
-                  <span class=\"ui-icon ui-icon-print\">$title</span>
-                </a>
-             </div>";
+      $v = new View("digibug_album.html");
+      $v->id = $child->id;
+      $v->return = "album/{$child->parent()->id}";
+      $v->title = t("Print photo with Digibug");
+      return $v->render();
     }
     return "";
   }
-- 
cgit v1.2.3


From 231ad4f32950f42c76c16ab453246bedea8abf2c Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Tue, 23 Jun 2009 22:13:28 -0700
Subject: This implements the Digibug printing.  When a a print request is made
 the digibug shopping cart is opened in a new window.  When the cart is
 emptied, the window is closed. Users can close the window by pressing the
 continue shopping button

---
 modules/digibug/controllers/digibug.php       | 12 ++++---
 modules/digibug/helpers/digibug_installer.php |  2 +-
 modules/digibug/helpers/digibug_theme.php     |  1 -
 modules/digibug/js/digibug.js                 | 52 +++++++++++++++++++--------
 modules/digibug/views/digibug_album.html.php  |  2 +-
 modules/digibug/views/digibug_form.html.php   | 16 +++++++++
 6 files changed, 62 insertions(+), 23 deletions(-)
 create mode 100644 modules/digibug/views/digibug_form.html.php

(limited to 'modules/digibug/helpers/digibug_theme.php')

diff --git a/modules/digibug/controllers/digibug.php b/modules/digibug/controllers/digibug.php
index b0807aa5..609da875 100644
--- a/modules/digibug/controllers/digibug.php
+++ b/modules/digibug/controllers/digibug.php
@@ -36,12 +36,13 @@ class Digibug_Controller extends Controller {
       $company_id = module::get_var("digibug", "company_id");
       $event_id = module::get_var("digibug", "event_id");
     }
-    $digibug_parms = array(
+    $v = new View("digibug_form.html");
+    $v->order_parms = array(
       "digibug_api_version" => "100",
       "company_id" => $company_id,
       "event_id" => $event_id,
       "cmd" => "adding",
-      "return_url" => url::abs_site($this->input->get("return")),
+      "return_url" => url::abs_site("digibug/close_window"),
       "num_images" => "1",
       "image_1" => $url,
       "thumb_1" => "$url/thumb",
@@ -51,9 +52,7 @@ class Digibug_Controller extends Controller {
       "thumb_width_1" => $item->thumb_width,
       "title" => $item->title);
 
-    message::success(
-      t("Photo '%title' was submitted for printing.", array("title" => $item->title)));
-    print json_encode(array("result" => "success", "reload" => 1));
+    print $v;
   }
 
   public function print_proxy($id, $thumb=null) {
@@ -90,4 +89,7 @@ class Digibug_Controller extends Controller {
     }
   }
 
+  public function close_window() {
+    print "<script type=\"text/javascript\">window.close();</script>";
+  }
 }
\ No newline at end of file
diff --git a/modules/digibug/helpers/digibug_installer.php b/modules/digibug/helpers/digibug_installer.php
index 73645eb7..0476e2cc 100644
--- a/modules/digibug/helpers/digibug_installer.php
+++ b/modules/digibug/helpers/digibug_installer.php
@@ -24,7 +24,7 @@ class digibug_installer {
       Database::instance()
         ->query("CREATE TABLE {proxies} (
                    `id` int(9) NOT NULL auto_increment,
-                   `uuid` char(32) NOT NULL,
+                   `uuid` char(36) NOT NULL,
                    `item_id` int(9),
                    PRIMARY KEY (`id`))
                  ENGINE=InnoDB DEFAULT CHARSET=utf8;");
diff --git a/modules/digibug/helpers/digibug_theme.php b/modules/digibug/helpers/digibug_theme.php
index 0fe2ce2e..e52fcc7f 100644
--- a/modules/digibug/helpers/digibug_theme.php
+++ b/modules/digibug/helpers/digibug_theme.php
@@ -34,7 +34,6 @@ class digibug_theme_Core {
     if ($theme->page_type() == "album" && $child->type == "photo") {
       $v = new View("digibug_album.html");
       $v->id = $child->id;
-      $v->return = "album/{$child->parent()->id}";
       $v->title = t("Print photo with Digibug");
       return $v->render();
     }
diff --git a/modules/digibug/js/digibug.js b/modules/digibug/js/digibug.js
index f30678c0..e9e8933e 100644
--- a/modules/digibug/js/digibug.js
+++ b/modules/digibug/js/digibug.js
@@ -5,20 +5,42 @@ $(document).ready(function() {
   });
 });
 
+function popUp(url, options) {
+  options = $.extend({
+    /* default options */
+    width:      400,
+    height:     400,
+    target:     'dbPopWin',
+    scrollbars: 'yes',
+    resizable:  'no',
+    menuBar:    'no',
+    addressBar: 'yes'}, options);
+
+  /* center the window by default. */
+  if (!options.winY) {
+    options.winY = screen.height / 2 - options.height / 2;
+  };
+  if (!options.winX) {
+    options.winX = screen.width / 2 - options.width / 2;
+  };
+
+  open(
+    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
+  );
+
+  return false;
+
+}
+
 function queue_print(e) {
-  var parent = e.currentTarget.parentNode;
-  $(parent).addClass("gLoadingLarge");
-  $.ajax({
-    type: "GET",
-    url: e.currentTarget.href,
-    dataType: "json",
-    success: function(data) {
-      $(parent).removeClass("gLoadingLarge");
-      if (data.location) {
-        window.location = data.location;
-      } else if (data.reload) {
-        window.location.reload();
-      }
-    }
-  });
+  return popUp(e.currentTarget.href, { width: 800, height: 600 } );
 };
diff --git a/modules/digibug/views/digibug_album.html.php b/modules/digibug/views/digibug_album.html.php
index 0f1537e9..c3337324 100644
--- a/modules/digibug/views/digibug_album.html.php
+++ b/modules/digibug/views/digibug_album.html.php
@@ -1,7 +1,7 @@
 <?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}&return=$return") ?>"
+     href="<?= url::site("digibug/print_photo/$id?csrf={$csrf}") ?>"
      title="<?= $title ?>">
     <span class="ui-icon ui-icon-print"><?= $title ?></span>
   </a>
diff --git a/modules/digibug/views/digibug_form.html.php b/modules/digibug/views/digibug_form.html.php
new file mode 100644
index 00000000..c2cd889e
--- /dev/null
+++ b/modules/digibug/views/digibug_form.html.php
@@ -0,0 +1,16 @@
+<?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() ?>
+</body>
+</html>
\ 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 'modules/digibug/helpers/digibug_theme.php')

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 f98b7dc631afc4da595aa149b21b5d38f41afd22 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sat, 27 Jun 2009 14:43:40 -0700
Subject: Require view_full to print photos.

---
 modules/digibug/controllers/digibug.php   | 1 +
 modules/digibug/helpers/digibug_theme.php | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'modules/digibug/helpers/digibug_theme.php')

diff --git a/modules/digibug/controllers/digibug.php b/modules/digibug/controllers/digibug.php
index 7bec4b86..45d3fde4 100644
--- a/modules/digibug/controllers/digibug.php
+++ b/modules/digibug/controllers/digibug.php
@@ -22,6 +22,7 @@ class Digibug_Controller extends Controller {
     access::verify_csrf();
 
     $item = ORM::factory("item", $id);
+    access::required("view_full", $id);
 
     $proxy = ORM::factory("digibug_proxy");
     $proxy->uuid =  md5(rand());
diff --git a/modules/digibug/helpers/digibug_theme.php b/modules/digibug/helpers/digibug_theme.php
index bd269256..a8e7e5b2 100644
--- a/modules/digibug/helpers/digibug_theme.php
+++ b/modules/digibug/helpers/digibug_theme.php
@@ -23,7 +23,8 @@ class digibug_theme_Core {
   }
 
   static function thumb_bottom($theme, $child) {
-    if ($theme->page_type() == "album" && $child->type == "photo") {
+    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");
-- 
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 'modules/digibug/helpers/digibug_theme.php')

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 5e83ebd6d0e1eccb1a865dc6c5fe2ef712bd421b Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Sun, 28 Jun 2009 16:50:55 -0700
Subject: Use $theme->script() method to render module javascript files

---
 modules/digibug/helpers/digibug_theme.php       | 2 +-
 modules/organize/helpers/organize_theme.php     | 8 +++-----
 modules/server_add/helpers/server_add_theme.php | 6 +++---
 modules/tag/helpers/tag_theme.php               | 7 +++++--
 modules/tag/views/admin_tags.html.php           | 1 -
 modules/user/helpers/user_theme.php             | 5 +----
 6 files changed, 13 insertions(+), 16 deletions(-)

(limited to 'modules/digibug/helpers/digibug_theme.php')

diff --git a/modules/digibug/helpers/digibug_theme.php b/modules/digibug/helpers/digibug_theme.php
index 3b5be3b3..f94d07c6 100644
--- a/modules/digibug/helpers/digibug_theme.php
+++ b/modules/digibug/helpers/digibug_theme.php
@@ -19,6 +19,6 @@
  */
 class digibug_theme_Core {
   static function head($theme) {
-    return html::script("modules/digibug/js/digibug.js");
+    $theme->script("modules/digibug/js/digibug.js");
   }
 }
diff --git a/modules/organize/helpers/organize_theme.php b/modules/organize/helpers/organize_theme.php
index 27f8cdb2..cddc48b6 100644
--- a/modules/organize/helpers/organize_theme.php
+++ b/modules/organize/helpers/organize_theme.php
@@ -20,11 +20,9 @@
 class organize_theme {
   static function head($theme) {
     // @tdo remove the addition css and organize.js (just here to test)
-    $script[] = html::script("modules/organize/js/organize_init.js");
-    $script[] = html::script("modules/organize/js/organize.js");
-    $script[] = "<link rel=\"stylesheet\" type=\"text/css\" href=\"" .
+    $theme->script("modules/organize/js/organize_init.js");
+    $theme->script("modules/organize/js/organize.js");
+    return "<link rel=\"stylesheet\" type=\"text/css\" href=\"" .
       url::file("modules/organize/css/organize.css") . "\" />";
-    return implode("\n", $script);
-    //return html::script("modules/organize/js/organize_init.js");
   }
 }
diff --git a/modules/server_add/helpers/server_add_theme.php b/modules/server_add/helpers/server_add_theme.php
index 4f307a2e..3df57ee4 100644
--- a/modules/server_add/helpers/server_add_theme.php
+++ b/modules/server_add/helpers/server_add_theme.php
@@ -20,7 +20,7 @@
 class server_add_theme_Core {
   static function head($theme) {
     if (user::active()->admin) {
-      return html::script("modules/server_add/js/server_add.js");
+      $theme->script("modules/server_add/js/server_add.js");
     }
   }
 
@@ -33,8 +33,8 @@ class server_add_theme_Core {
       $csrf = access::csrf_token();
       $head[] = "<script> var base_url = \"$base\"; var csrf = \"$csrf\";</script>";
 
-      $head[] = html::script("lib/jquery.autocomplete.js");
-      $head[] = html::script("modules/server_add/js/admin.js");
+      $theme->script("lib/jquery.autocomplete.js");
+      $theme->script("modules/server_add/js/admin.js");
     }
 
     return implode("\n", $head);
diff --git a/modules/tag/helpers/tag_theme.php b/modules/tag/helpers/tag_theme.php
index a32d71b6..b48ad178 100644
--- a/modules/tag/helpers/tag_theme.php
+++ b/modules/tag/helpers/tag_theme.php
@@ -19,8 +19,11 @@
  */
 class tag_theme_Core {
   static function head($theme) {
-    $url = url::file("modules/tag/js/tag.js");
-    return "<script src=\"$url\" type=\"text/javascript\"></script>";
+    $theme->script("modules/tag/js/tag.js");
+  }
+
+  static function admin_head($theme) {
+    $theme->script("modules/tag/js/tag.js");
   }
 
   static function sidebar_blocks($theme) {
diff --git a/modules/tag/views/admin_tags.html.php b/modules/tag/views/admin_tags.html.php
index 21661c48..7d201da7 100644
--- a/modules/tag/views/admin_tags.html.php
+++ b/modules/tag/views/admin_tags.html.php
@@ -1,5 +1,4 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
-<script src="<?= url::file("modules/tag/js/tag.js") ?>" type="text/javascript"></script>
 <script>
   var TAG_RENAME_URL = "<?= url::site("admin/tags/rename/__ID__") ?>";
   $("document").ready(function() {
diff --git a/modules/user/helpers/user_theme.php b/modules/user/helpers/user_theme.php
index 2a4a343a..ad9d4c63 100644
--- a/modules/user/helpers/user_theme.php
+++ b/modules/user/helpers/user_theme.php
@@ -25,11 +25,8 @@ class user_theme_Core {
   }
 
   static function admin_head($theme) {
-    $head = array();
     if (strpos(Router::$current_uri, "admin/users") !== false) {
-      $head[] = html::script("lib/gallery.panel.js");
+      $theme->script("lib/gallery.panel.js");
     }
-
-    return implode("\n", $head);
   }
 }
-- 
cgit v1.2.3