From e37526f94df74a52a9cf36f0a5a5e641958ebbb3 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Wed, 5 Aug 2009 09:23:01 -0700
Subject: Revert "Enable the expand/collapse of branches by clicking on the
 plus/minus"

This reverts commit 869c3de9612a598dae0ce400991bdbe173a2decc.
---
 modules/organize/views/organize_tree.html.php | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'modules/organize/views/organize_tree.html.php')

diff --git a/modules/organize/views/organize_tree.html.php b/modules/organize/views/organize_tree.html.php
index d64410d8..28b45be0 100644
--- a/modules/organize/views/organize_tree.html.php
+++ b/modules/organize/views/organize_tree.html.php
@@ -1,11 +1,11 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <li class="gOrganizeBranch ui-icon-left" ref="<?= $album->id ?>">
+  <span id="gOrganizeIcon-<?= $album->id ?>" ref="<?= $album->id ?>"
+        class="ui-icon <?= $album_icon ?> <?= $album_icon ? "" : "gBranchEmpty" ?>">
+  </span>
 
   <div id="gOrganizeBranch-<?= $album->id ?>" ref="<?= $album->id ?>"
        class="<?= $selected ? "gBranchSelected" : "" ?> gBranchText">
-    <span id="gOrganizeIcon-<?= $album->id ?>" ref="<?= $album->id ?>"
-          class="ui-icon <?= $album_icon ?>">
-    </span>
     <?= p::clean($album->title) ?>
   </div>
   <? if (empty($children)): ?>
@@ -13,9 +13,7 @@
   <? else: ?>
     <ul id="gOrganizeChildren-<?= $album->id ?>"
        class="<?= $album_icon == "ui-icon-plus" ? "gBranchCollapsed" : "" ?>">
-      <? foreach ($children as $child): ?>
-        <?= $child ?>
-      <? endforeach ?>
+      <?= $children ?>
     </ul>
   <? endif ?>
 </li>
-- 
cgit v1.2.3