From 72deeb1119e7888e26b0656ae811be3f4e534e11 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Fri, 20 Nov 2009 10:26:11 -0800
Subject: Remove all style from the organize.css file and make use of the
 themeroller styles as much as possible.

---
 modules/organize/views/organize_dialog.html.php     | 6 +++---
 modules/organize/views/organize_thumb_grid.html.php | 4 ++--
 modules/organize/views/organize_tree.html.php       | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'modules/organize/views')

diff --git a/modules/organize/views/organize_dialog.html.php b/modules/organize/views/organize_dialog.html.php
index 31f788ad..435f5ae3 100644
--- a/modules/organize/views/organize_dialog.html.php
+++ b/modules/organize/views/organize_dialog.html.php
@@ -15,16 +15,16 @@
       </ul>
     </div>
     <div id="g-organize-detail" class="g-left ui-helper-clearfix">
-      <div id="g-organize-microthumb-panel"
+      <div id="g-organize-microthumb-panel" class="ui-widget"
            ref="<?= url::site("organize/album/__ITEM_ID__/__OFFSET__") ?>">
         <ul id="g-action-status" class="g-message-block">
           <li class="g-info"><?= t("Drag and drop photos to re-order or move between albums") ?></li>
         </ul>
-        <ul id="g-organize-microthumb-grid">
+        <ul id="g-organize-microthumb-grid" class="ui-widget-content">
           <?= $micro_thumb_grid ?>
         </ul>
       </div>
-      <div id="g-organize-controls">
+      <div id="g-organize-controls" class="ui-widget-header">
         <a id="g-organize-close" href="#" ref="done"
            class="g-button g-right ui-corner-all ui-state-default"><?= t("Close") ?></a>
         <form>
diff --git a/modules/organize/views/organize_thumb_grid.html.php b/modules/organize/views/organize_thumb_grid.html.php
index 3ac32ce0..9a9cd819 100644
--- a/modules/organize/views/organize_thumb_grid.html.php
+++ b/modules/organize/views/organize_thumb_grid.html.php
@@ -1,8 +1,8 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <? foreach ($album->children(25, $offset) as $child): ?>
-<li class="g-organize-microthumb-grid-cell g-left" ref="<?= $child->id ?>">
+<li class="g-organize-microthumb-grid-cell g-left ui-state-default" ref="<?= $child->id ?>">
   <div id="g-organize-microthumb-<?= $child->id ?>"
-       class="g-organize-microthumb <?= $child->is_album() ? "g-album" : "g-photo" ?>">
+       class="g-organize-microthumb <?= $child->is_album() ? "g-album" : "g-photo" ?> ui-state-active">
     <?= $child->thumb_img(array("class" => "g-thumbnail", "ref" => $child->id), 90, true) ?>
     <span<?= $child->is_album() ? " class=\"ui-icon ui-icon-note\"" : "" ?>></span>
   </div>
diff --git a/modules/organize/views/organize_tree.html.php b/modules/organize/views/organize_tree.html.php
index 740c2521..50c8c351 100644
--- a/modules/organize/views/organize_tree.html.php
+++ b/modules/organize/views/organize_tree.html.php
@@ -3,7 +3,7 @@
     ref="<?= $album->id ?>">
   <span class="ui-icon ui-icon-minus">
   </span>
-  <span class="g-organize-album-text <?= $selected && $album->id == $selected->id ? "selected" : "" ?>"
+  <span class="g-organize-album-text <?= $selected && $album->id == $selected->id ? "ui-state-focus" : "" ?>"
         ref="<?= $album->id ?>">
     <?= html::clean($album->title) ?>
   </span>
-- 
cgit v1.2.3


From e8fb773b68335e955602c0d912e13c0f5ba23d58 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Thu, 26 Nov 2009 19:33:03 -0800
Subject: Update all portable where clauses to the new Kohana 2.4 format.

---
 modules/gallery/helpers/gallery_rss.php       | 4 ++--
 modules/gallery/tests/ORM_MPTT_Test.php       | 4 ++--
 modules/organize/views/organize_tree.html.php | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'modules/organize/views')

diff --git a/modules/gallery/helpers/gallery_rss.php b/modules/gallery/helpers/gallery_rss.php
index 93ace10b..4aef27ad 100644
--- a/modules/gallery/helpers/gallery_rss.php
+++ b/modules/gallery/helpers/gallery_rss.php
@@ -49,9 +49,9 @@ class gallery_rss_Core {
 
       $feed->children = $item
         ->viewable()
-        ->descendants($limit, $offset, array("type" => "photo"));
+        ->descendants($limit, $offset, array(array("type", "=", "photo")));
       $feed->max_pages = ceil(
-        $item->viewable()->descendants_count(array("type" => "photo")) / $limit);
+        $item->viewable()->descendants_count(array("type", "=", "photo")) / $limit);
       $feed->title = html::purify($item->title);
       $feed->description = nl2br(html::purify($item->description));
 
diff --git a/modules/gallery/tests/ORM_MPTT_Test.php b/modules/gallery/tests/ORM_MPTT_Test.php
index a749542b..36a81d2c 100644
--- a/modules/gallery/tests/ORM_MPTT_Test.php
+++ b/modules/gallery/tests/ORM_MPTT_Test.php
@@ -228,7 +228,7 @@ class ORM_MPTT_Test extends Unit_Test_Case {
     $parent->reload();
 
     $this->assert_equal(3, $parent->descendants_count());
-    $this->assert_equal(2, $parent->descendants_count(array("type" => "photo")));
-    $this->assert_equal(1, $parent->descendants_count(array("type" => "album")));
+    $this->assert_equal(2, $parent->descendants_count(array(array("type", "=", "photo"))));
+    $this->assert_equal(1, $parent->descendants_count(array(array("type", "=", "album"))));
   }
 }
diff --git a/modules/organize/views/organize_tree.html.php b/modules/organize/views/organize_tree.html.php
index 740c2521..1ccb942c 100644
--- a/modules/organize/views/organize_tree.html.php
+++ b/modules/organize/views/organize_tree.html.php
@@ -8,7 +8,7 @@
     <?= html::clean($album->title) ?>
   </span>
   <ul>
-    <? foreach ($album->children(null, 0, array("type" => "album")) as $child): ?>
+    <? foreach ($album->children(null, 0, array(array("type", "=", "album"))) as $child): ?>
     <? if ($selected && $child->contains($selected)): ?>
     <?= View::factory("organize_tree.html", array("selected" => $selected, "album" => $child)); ?>
     <? else: ?>
-- 
cgit v1.2.3


From a3d904bcbab7cb153c2b617fc4389175ed00a4fc Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Thu, 26 Nov 2009 19:36:57 -0800
Subject: ORM::find_all() now uses null as the default value for offset.

---
 modules/gallery/libraries/ORM_MPTT.php        | 2 +-
 modules/gallery/models/item.php               | 2 +-
 modules/organize/views/organize_tree.html.php | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'modules/organize/views')

diff --git a/modules/gallery/libraries/ORM_MPTT.php b/modules/gallery/libraries/ORM_MPTT.php
index 90b9d38a..a67f05be 100644
--- a/modules/gallery/libraries/ORM_MPTT.php
+++ b/modules/gallery/libraries/ORM_MPTT.php
@@ -150,7 +150,7 @@ class ORM_MPTT_Core extends ORM {
    * @param   array    order_by
    * @return array ORM
    */
-  function children($limit=null, $offset=0, $where=null, $order_by=array("id" => "ASC")) {
+  function children($limit=null, $offset=null, $where=null, $order_by=array("id" => "ASC")) {
     if ($where) {
       $this->merge_where($where);
     }
diff --git a/modules/gallery/models/item.php b/modules/gallery/models/item.php
index acc4e96f..16c57dbc 100644
--- a/modules/gallery/models/item.php
+++ b/modules/gallery/models/item.php
@@ -597,7 +597,7 @@ class Item_Model extends ORM_MPTT {
    * @param   array    order_by
    * @return array ORM
    */
-  function children($limit=null, $offset=0, $where=array(), $order_by=null) {
+  function children($limit=null, $offset=null, $where=array(), $order_by=null) {
     if (empty($order_by)) {
       $order_by = array($this->sort_column => $this->sort_order);
       // Use id as a tie breaker
diff --git a/modules/organize/views/organize_tree.html.php b/modules/organize/views/organize_tree.html.php
index 1ccb942c..c5257956 100644
--- a/modules/organize/views/organize_tree.html.php
+++ b/modules/organize/views/organize_tree.html.php
@@ -8,7 +8,7 @@
     <?= html::clean($album->title) ?>
   </span>
   <ul>
-    <? foreach ($album->children(null, 0, array(array("type", "=", "album"))) as $child): ?>
+    <? foreach ($album->children(null, null, array(array("type", "=", "album"))) as $child): ?>
     <? if ($selected && $child->contains($selected)): ?>
     <?= View::factory("organize_tree.html", array("selected" => $selected, "album" => $child)); ?>
     <? else: ?>
-- 
cgit v1.2.3