Author: sevein
Date: Fri Apr  6 08:48:56 2012
New Revision: 11412

Log:
Issue 2288. Fixes in the treeview

Modified:
   branches/2.0/apps/qubit/modules/informationobject/templates/_contextMenu.php
   branches/2.0/apps/qubit/modules/informationobject/templates/_treeView.php
   
branches/2.0/plugins/sfRadPlugin/modules/sfRadPlugin/templates/indexSuccess.php

Modified: 
branches/2.0/apps/qubit/modules/informationobject/templates/_contextMenu.php
==============================================================================
--- 
branches/2.0/apps/qubit/modules/informationobject/templates/_contextMenu.php    
    Fri Apr  6 08:27:53 2012        (r11411)
+++ 
branches/2.0/apps/qubit/modules/informationobject/templates/_contextMenu.php    
    Fri Apr  6 08:48:56 2012        (r11412)
@@ -107,7 +107,7 @@
             <li><a href="#">Buildings<span>3</span></a></li>
           </ul>
         </div>
-      </div><!-- /.section -->
+      </div>
 
       <div class="section">
         <h2 class="mobileonly widebtn gray btn-huge" data-toggle="collapse" 
data-target="#mediatypes">Media Types</h2>
@@ -131,7 +131,7 @@
             <li><a href="#">Buildings<span>3</span></a></li>
           </ul>
         </div>
-      </div><!-- /.section -->
+      </div>
 
       <div class="section">
         <h2 class="mobileonly widebtn gray btn-huge" data-toggle="collapse" 
data-target="#dates">Creation Date</h2>
@@ -141,7 +141,7 @@
         <div class="scrollable dates" id="dates">
           <input type="text" value="1877" name="from" /> - <input type="text" 
value="1999" name="to" />
         </div>
-      </div><!-- /.section -->
+      </div>
 
 
       <div class="section">
@@ -166,7 +166,7 @@
             <li><a href="#">Bad Homburg vor der Hohe<span>3</span></a></li>
           </ul>
         </div>
-      </div><!-- /.section -->
+      </div>
 
 
       <div class="section">
@@ -185,7 +185,7 @@
             <li><a href="#">Frasier<span>100</span></a></li>
           </ul>
         </div>
-      </div><!-- /.section -->
+      </div>
     </div>
     -->
 

Modified: 
branches/2.0/apps/qubit/modules/informationobject/templates/_treeView.php
==============================================================================
--- branches/2.0/apps/qubit/modules/informationobject/templates/_treeView.php   
Fri Apr  6 08:27:53 2012        (r11411)
+++ branches/2.0/apps/qubit/modules/informationobject/templates/_treeView.php   
Fri Apr  6 08:48:56 2012        (r11412)
@@ -29,20 +29,16 @@
       <?php endforeach; ?>
       <?php unset($doc['i18n']) // continue; ?>
 
+      <?php $title = $doc[$sf_user->getCulture()]['title'] ?: 
$doc[$doc['sourceCulture']]['title'] ?>
+      <?php $expand = 0 < @$doc['children'] ? ' expand' : '' ?>
       <?php if ($hit->getId() == $resource->id): ?>
-        <li class="active"><?php echo $doc[$sf_user->getCulture()]['title'] ?: 
$doc[$doc['sourceCulture']]['title'] ?></li>
+        <li class="active<?php echo $expand ?>"><?php echo $title ?></li>
       <?php else: ?>
-        <li><?php echo 
link_to('<i></i>'.($doc[$sf_user->getCulture()]['title'] ?: 
$doc[$doc['sourceCulture']]['title']), array('module' => 'informationobject', 
'slug' => $doc['slug'])) ?></li>
+        <li class="<?php echo $expand ?>"><?php echo link_to('<i></i>'.$title, 
array('module' => 'informationobject', 'slug' => $doc['slug'])) ?></li>
       <?php endif; ?>
 
     <?php endforeach; ?>
 
-    <!--
-    <li class="up"><a href="#"><i></i>Foobar <strong>Fonds</strong></a></li>
-    <li class="expand"><a href="#"><i></i>Douglas Coupland 
<strong>File</strong></a></li>
-    <li class=""><a href="#">Charles Xingpeau <strong>File</strong></a></li>
-    -->
-
   </ul>
 
 </div>

Modified: 
branches/2.0/plugins/sfRadPlugin/modules/sfRadPlugin/templates/indexSuccess.php
==============================================================================
--- 
branches/2.0/plugins/sfRadPlugin/modules/sfRadPlugin/templates/indexSuccess.php 
    Fri Apr  6 08:27:53 2012        (r11411)
+++ 
branches/2.0/plugins/sfRadPlugin/modules/sfRadPlugin/templates/indexSuccess.php 
    Fri Apr  6 08:48:56 2012        (r11412)
@@ -3,12 +3,13 @@
 <div id="main-column" class="span9 offset3">
 
   <div id="headline">
-    <h1><?php echo render_title($rad) ?> <strong>Hola</strong></h1>
+    <h1><?php echo render_title($rad) ?> <strong><?php echo 
$resource->levelOfDescription ?></strong></h1>
   </div>
 
   <ul class="breadcrumb">
-    <li><a href="#">Vancouver Martime Archive</a></li>
-    <li><a href="#">Douglas Coupland File</a></li>
+    <li><a href="#">Breadcumb</a></li>
+    <li><a href="#">Breadcumb</a></li>
+    <li><a href="#">Breadcumb</a></li>
   </ul>
 
   <!--

-- 
You received this message because you are subscribed to the Google Groups 
"Qubit Toolkit Commits" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to 
[email protected].
For more options, visit this group at 
http://groups.google.com/group/qubit-commits?hl=en.

Reply via email to