Improved tags handling, collections browsing, dashboard

admin/themes/default/collections/browse.php

@@ -1,8 +1,10 @@
 <?php
+queue_js_file('collections-browse');
 $pageTitle = __('Browse Collections') . ' ' .  __('(%s total)', $total_results);
 $totalItemsWithoutCollection = get_db()->getTable('Item')->count(array('collection' => 0));
 echo head(array('title'=>$pageTitle, 'bodyclass'=>'collections browse'));
 echo flash();
+echo collection_search_filters();
 ?>
 
 <?php if (total_records('Collection') > 0): ?>
@@ -12,6 +14,7 @@
             <?php echo __('Add a Collection'); ?>
         </a>
     <?php endif; ?>
+	<?php echo common('quick-filters', array(), 'collections'); ?>
     <p class="not-in-collections">
     <?php if ($totalItemsWithoutCollection):
         $withoutCollectionMessage = __(plural('%s%d item%s has no collection.', "%s%d items%s aren't in a collection.",
@@ -85,7 +88,17 @@
         <?php if (is_allowed('Collections', 'add')): ?>
             <a href="<?php echo html_escape(url('collections/add')); ?>" class="green button"><?php echo __('Add a Collection'); ?></a>
         <?php endif; ?>
+		<?php echo common('quick-filters', array(), 'collections'); ?>
         <p class="not-in-collections"><?php echo $withoutCollectionMessage; ?></p>
+
+    <script type="text/javascript">
+    Omeka.addReadyCallback(Omeka.CollectionsBrowse.setupDetails, [
+        <?php echo js_escape(__('Details')); ?>,
+        <?php echo js_escape(__('Show Details')); ?>,
+        <?php echo js_escape(__('Hide Details')); ?>
+    ]);
+    </script>
+
     <?php else: ?>
         <p><?php echo __('There are no collections on this page.'); ?> <?php echo link_to('collections', null, __('View All Collections')); ?></p>
     <?php endif; ?>

admin/themes/default/collections/quick-filters.php

@@ -0,0 +1,11 @@
+<ul class="quick-filter-wrapper">
+    <li><a href="#"><?php echo __('Quick Filter'); ?></a>
+    <ul class="dropdown">
+        <li><span class="quick-filter-heading"><?php echo __('Quick Filter') ?></span></li>
+        <li><a href="<?php echo url('collections/browse'); ?>"><?php echo __('View All') ?></a></li>
+        <li><a href="<?php echo url('collections/browse', array('public' => 1)); ?>"><?php echo __('Public'); ?></a></li>
+        <li><a href="<?php echo url('collections/browse', array('public' => 0)); ?>"><?php echo __('Private'); ?></a></li>
+        <li><a href="<?php echo url('collections/browse', array('featured' => 1)); ?>"><?php echo __('Featured'); ?></a></li>
+    </ul>
+    </li>
+</ul>

admin/themes/default/index.php

@@ -51,7 +51,7 @@
 <?php ob_start(); ?>
 <h2><?php echo __('Recent Items'); ?></h2>
 <?php
-    set_loop_records('items', get_recent_items(5));
+    set_loop_records('items', get_recent_items(get_option('recent_admin')));
     foreach (loop('items') as $item):
 ?>
     <div class="recent-row">
@@ -69,7 +69,7 @@
 <?php ob_start(); ?>
 <h2><?php echo __('Recent Collections'); ?></h2>
 <?php
-    $collections = get_recent_collections(5);
+    $collections = get_recent_collections(get_option('recent_admin'));
     set_loop_records('collections', $collections);
     foreach (loop('collections') as $collection):
 ?>

admin/themes/default/items/batch-edit.php

@@ -1,4 +1,6 @@
 <?php
+queue_js_file('items');
+$tagDelimiter = get_option('tag_delimiter');
 $title = __('Batch Edit Items');
 if (!$isPartial):
     echo head(
@@ -12,6 +14,14 @@
 <div title="<?php echo $title; ?>">
 
 <form id="batch-edit-form" action="<?php echo html_escape(url('items/batch-edit-save')); ?>" method="post" accept-charset="utf-8">
+    <script type="text/javascript">
+    //<![CDATA[
+    jQuery(document).ready(function () {
+        Omeka.Items.tagDelimiter = <?php echo js_escape($tagDelimiter); ?>;
+        Omeka.Items.tagChoices('#metadata-tags', <?php echo js_escape(url(array('controller' => 'tags', 'action' => 'autocomplete'), 'default', array(), true)); ?>);
+    });
+    //]]>
+    </script>
     <section class="seven columns alpha">
         <fieldset id="item-list" class="panel">
             <h2><?php echo __('Items'); ?></h2>

admin/themes/default/javascripts/collections-browse.js

@@ -0,0 +1,39 @@
+if (!Omeka) {
+    var Omeka = {};
+}
+
+Omeka.CollectionsBrowse = {};
+
+(function ($) {
+    Omeka.CollectionsBrowse.setupDetails = function (detailsText, showDetailsText, hideDetailsText) {
+        $('.details').hide();
+        $('.action-links').prepend('<li class="details-link">' + detailsText + '</li> ');
+
+        $('tr.collection').each(function() {
+            var collectionDetails = $(this).find('.details');
+            if ($.trim(collectionDetails.html()) != '') {
+                $(this).find('.details-link').css({'color': '#4E7181', 'cursor': 'pointer'}).click(function() {
+                    collectionDetails.slideToggle('fast');
+                });
+            }
+        });
+
+        var toggleList = '<a href="#" class="toggle-all-details small blue button">' + showDetailsText + '</a>';
+
+        $('.quick-filter-wrapper').before(toggleList);
+
+        // Toggle collection details.
+        var detailsShown = false;
+        $('.toggle-all-details').click(function (e) {
+            e.preventDefault();
+            if (detailsShown) {
+            	$('.toggle-all-details').text(showDetailsText);
+            	$('.details').slideUp('fast');
+            } else {
+            	$('.toggle-all-details').text(hideDetailsText);
+            	$('.details').slideDown('fast');
+            }
+            detailsShown = !detailsShown;
+        });
+    };
+})(jQuery);

application/controllers/AppearanceController.php

@@ -14,6 +14,7 @@ class AppearanceController extends Omeka_Controller_AbstractActionController
     const DEFAULT_FULLSIZE_CONSTRAINT = 800;
     const DEFAULT_THUMBNAIL_CONSTRAINT = 200;
     const DEFAULT_SQUARE_THUMBNAIL_CONSTRAINT = 200;
+    const DEFAULT_RECENT_ADMIN = 5;
     const DEFAULT_PER_PAGE_ADMIN = 10;
     const DEFAULT_PER_PAGE_PUBLIC = 10;
 

application/controllers/TagsController.php

@@ -88,6 +88,23 @@ protected function _getBrowseDefaultSort()
         return array('name', 'a');
     }
 
+    protected function _getDeleteConfirmMessage($tag)
+    {
+        return __('This will delete the tag "%s" from all records associated to it.', $tag->name);
+    }
+
+    /**
+     * Redirect to another page after a record is successfully deleted.
+     *
+     * The default is to redirect to this controller's browse page.
+     *
+     * @param Omeka_Record_AbstractRecord $record
+     */
+    protected function _redirectAfterDelete($record)
+    {
+        $this->_helper->redirector('browse');
+    }
+
     public function autocompleteAction()
     {
         $tagText = $this->_getParam('term');
@@ -109,8 +126,15 @@ public function renameAjaxAction()
 
         $oldTag->name = $newName;
         $this->_helper->viewRenderer->setNoRender();
-        if ($csrf->isValid($_POST) && $oldTag->save(false)) {
-            $this->getResponse()->setBody($newName);
+        if ($csrf->isValid($_POST)) {
+            if ($oldTag->save(false)) {
+                $this->getResponse()->setBody($newName);
+            } else {
+                $newTag = $this->_helper->db->findOrNew($newName);
+                $newTagId = $newTag->id;
+                $count = $this->_helper->db->mergeTags($oldTagId, $newTagId);
+                $this->getResponse()->setBody($newName);
+            }
         } else {
             $this->getResponse()->setHttpResponseCode(500);
             $this->getResponse()->setBody($error);

application/forms/AppearanceSettings.php

@@ -44,6 +44,13 @@ public function init()
             'required' => true,
         ));
 
+        $this->addElement('text', 'recent_admin', array(
+            'label' => __('Recents Items/Collections (admin)'),
+            'description' => __('Limit the number of recent Items and Collections displayed in the administrative inteface.'),
+            'validators' => array('Digits'),
+            'required' => true,
+        ));
+
         $this->addElement('text', 'per_page_admin', array(
             'label' => __('Results Per Page (admin)'),
             'description' => __('Limit the number of results displayed per page in the administrative interface.'),
@@ -101,7 +108,7 @@ public function init()
 
         $this->addDisplayGroup(
             array(
-                'use_square_thumbnail', 'link_to_file_metadata', 'per_page_admin', 'per_page_public',
+                'use_square_thumbnail', 'link_to_file_metadata', 'recent_admin', 'per_page_admin', 'per_page_public',
                 'show_empty_elements', 'show_element_set_headings',
             ),
             'display-settings', array('legend' => __('Display Settings'))

application/forms/Install.php

@@ -15,6 +15,7 @@ class Omeka_Form_Install extends Omeka_Form
     const DEFAULT_FULLSIZE_CONSTRAINT = 800;
     const DEFAULT_THUMBNAIL_CONSTRAINT = 200;
     const DEFAULT_SQUARE_THUMBNAIL_CONSTRAINT = 200;
+    const DEFAULT_RECENT_ADMIN = 5;
     const DEFAULT_PER_PAGE_ADMIN = 10;
     const DEFAULT_PER_PAGE_PUBLIC = 10;
     const DEFAULT_SHOW_EMPTY_ELEMENTS = false;
@@ -213,6 +214,14 @@ public function init()
             'required' => true
         ));
 
+        $this->addElement('text', 'recent_admin', array(
+            'label' => __('Recent Items/Collections (admin)'),
+            'description' => __('Limit the number of recent Items and Collections displayed in the administrative inteface.'),
+            'value' => self::DEFAULT_RECENT_ADMIN,
+            'validators' => array('Digits'),
+            'required' => true
+        ));
+
         $this->addElement('text', 'per_page_admin', array(
             'label' => __('Items Per Page (admin)'),
             'description' => __('Limit the number of items displayed per page in the administrative interface.'),
@@ -275,8 +284,8 @@ public function init()
             array('administrator_email', 'site_title', 'description',
                   'copyright', 'author', 'tag_delimiter', 'fullsize_constraint',
                   'thumbnail_constraint', 'square_thumbnail_constraint',
-                  'per_page_admin', 'per_page_public', 'show_empty_elements',
-                  'path_to_convert'),
+                  'recent_admin', 'per_page_admin', 'per_page_public', 
+                  'show_empty_elements', 'path_to_convert'),
             'site_settings',
             array('legend' => __('Site Settings'))
         );

application/libraries/globals.php

@@ -2036,6 +2036,19 @@ function item_search_filters(array $params = null)
     return get_view()->itemSearchFilters($params);
 }
 
+/**
+ * Get a list of the current search collection filters in use.
+ *
+ * @package Omeka\Function\Search
+ * @uses Omeka_View_Helper_SearchFilters::searchFilters()
+ * @params array $params Params to override the ones read from the request.
+ * @return string
+ */
+function collection_search_filters(array $params = null)
+{
+    return get_view()->collectionSearchFilters($params);
+}
+
 /**
  * Get metadata for a record.
  *

application/models/Installer/Default.php

@@ -106,6 +106,7 @@ private function _addOptions()
             'thumbnail_constraint' => $this->_getValue('thumbnail_constraint'),
             'square_thumbnail_constraint' => $this->_getValue('square_thumbnail_constraint'),
             'fullsize_constraint' => $this->_getValue('fullsize_constraint'),
+            'recent_admin' => $this->_getValue('recent_admin'),
             'per_page_admin' => $this->_getValue('per_page_admin'),
             'per_page_public' => $this->_getValue('per_page_public'),
             'show_empty_elements' => $this->_getValue('show_empty_elements'),

application/models/Installer/Task/Options.php

@@ -22,6 +22,7 @@ class Installer_Task_Options implements Installer_TaskInterface
         'thumbnail_constraint',
         'square_thumbnail_constraint',
         'fullsize_constraint',
+        'recent_admin',
         'per_page_admin',
         'per_page_public',
         'show_empty_elements',

application/models/Installer/Test.php

@@ -24,6 +24,7 @@ class Installer_Test extends Installer_Default
         'thumbnail_constraint' => Omeka_Form_Install::DEFAULT_THUMBNAIL_CONSTRAINT,
         'square_thumbnail_constraint' => Omeka_Form_Install::DEFAULT_SQUARE_THUMBNAIL_CONSTRAINT,
         'fullsize_constraint' => Omeka_Form_Install::DEFAULT_FULLSIZE_CONSTRAINT,
+        'recent_admin' => Omeka_Form_Install::DEFAULT_RECENT_ADMIN,
         'per_page_admin' => Omeka_Form_Install::DEFAULT_PER_PAGE_ADMIN,
         'per_page_public' => Omeka_Form_Install::DEFAULT_PER_PAGE_PUBLIC,
         'show_empty_elements' => Omeka_Form_Install::DEFAULT_SHOW_EMPTY_ELEMENTS,