Merge 'develop' into 'file-layout'.

omeka · Mar 15, 2016 · 6578e5e · 6578e5e
1 parent 92bbde6
commit 6578e5e
Show file tree

Hide file tree

Showing 116 changed files with 3,175 additions and 2,696 deletions.
diff --git a/README.md b/README.md
@@ -63,7 +63,14 @@ You can find Omeka-specific code under `application/`.
 ## local.config.php options
 
 * `thumbnailer` Default is `Omeka\File\ImageMagickThumbnailer`. Also available are `Omeka\File\IMagickThumbnailer` and `Omeka\File\GdThumbnailer`
-* `phpcli_path` Default is to attempt to detect correct path to PHP. Use this option to specify a path if needed in your server configuration.
+* `phpcli_path` Default is to attempt to detect correct path to PHP. Use this option to specify a path if needed in your server configuration. For example: 
+```
+    'cli' => array(
+        'phpcli_path' => '/usr/bin/php55',
+    ),
+
+``` 
+
 
 ## Libraries
 

diff --git a/application/Module.php b/application/Module.php
@@ -20,7 +20,7 @@ class Module extends AbstractModule
     /**
      * This Omeka version.
      */
-    const VERSION = '0.4.5-alpha';
+    const VERSION = '0.5.0-alpha';
 
     /**
      * @var array View helpers that need service manager injection
@@ -37,6 +37,7 @@ class Module extends AbstractModule
         'blockLayout' => 'Omeka\View\Helper\BlockLayout',
         'userIsAllowed' => 'Omeka\View\Helper\UserIsAllowed',
         'navigationLink' => 'Omeka\View\Helper\NavigationLink',
+        'deleteConfirmForm' => 'Omeka\View\Helper\DeleteConfirmForm'
     ];
 
     /**

diff --git a/application/asset/css/style.css b/application/asset/css/style.css
@@ -1207,6 +1207,10 @@ th {
     content: "";
   }
 
+  #menu a.theme:before {
+    content: "";
+  }
+
   /* @end */
   /* @end */
   /* @group ----- Wrappers ----- */
@@ -2661,6 +2665,7 @@ th {
     position: fixed;
     top: 5.25em;
     left: 100%;
+    visibility: hidden;
     bottom: 0;
     background-color: #f7f7f7;
     z-index: 3;
@@ -2673,8 +2678,9 @@ th {
     -webkit-transition-duration: 0.5s;
     transition-duration: 0.5s;
   }
-  .sidebar.active {
+  .sidebar.active, .sidebar.always-open {
     left: 75.52083%;
+    visibility: visible;
   }
   .sidebar .o-icon-close {
     position: absolute;
@@ -3734,11 +3740,11 @@ th {
     width: 100%;
   }
 
-  .sidebar.active {
+  .sidebar.always-open {
     left: 100%;
   }
 
-  .sidebar.mobile.active,
+  .sidebar.active,
   #resource-details.active #select-item,
   .confirm-panel {
     left: 0;

diff --git a/application/asset/js/global.js b/application/asset/js/global.js
@@ -3,7 +3,7 @@ var Omeka = {
         //close delete sidebar if open
         if (!context.hasClass('delete')) {
             if ($('#delete').hasClass('active')) {
-                $('#delete').removeClass('mobile active');
+                $('#delete').removeClass('active');
             }
         }
 
@@ -19,38 +19,22 @@ var Omeka = {
         if (!$('body').hasClass('sidebar-open')) {
             $('body').addClass('sidebar-open');
         }
-        var sidebarConfirm = $('#sidebar-confirm');
-        if (context.hasClass('sidebar-confirm')) {
-            sidebarConfirm.show();
-            $('#sidebar-confirm form').attr(
-                'action', context.data('sidebar-confirm-url'));
-        } else {
-            sidebarConfirm.hide();
-        }
+
         if (context.attr('data-sidebar-content-url')) {
             this.populateSidebarContent(context, sidebar);
         }
-        sidebar.addClass('mobile active');
+        sidebar.addClass('active');
         return sidebar;
     },
 
     closeSidebar : function(context) {
-        if (context.hasClass('mobile-only')) {
-            context.closest('.active').removeClass('mobile');
-        } else {
-            context.closest('.active').removeClass('mobile active');
-            if ($('.active.sidebar').length < 1) {
-                $('body').removeClass('sidebar-open');
-            }
+        context.removeClass('active');
+        context.closest('.active').removeClass('active');
+        if ($('.active.sidebar').length < 1 && $('.always-open.sidebar').length < 1) {
+            $('body').removeClass('sidebar-open');
         }
     },
 
-    switchActiveSection: function (section) {
-        $('.section.active, .section-nav li.active').removeClass('active');
-        section.addClass('active');
-        $('.section-nav a[href="#' + section.attr('id') + '"]').parent().addClass('active');
-    },
-
     populateSidebarContent : function(context, sidebar) {
         var url = context.data('sidebar-content-url');
         var sidebarContent = sidebar.find('.sidebar-content');
@@ -66,6 +50,12 @@ var Omeka = {
         });
     },
 
+    switchActiveSection: function (section) {
+        $('.section.active, .section-nav li.active').removeClass('active');
+        section.addClass('active');
+        $('.section-nav a[href="#' + section.attr('id') + '"]').parent().addClass('active');
+    },
+
     filterSelector : function() {
         var filter = $(this).val().toLowerCase();
         var selector = $(this).closest('.selector');
@@ -126,15 +116,37 @@ var Omeka = {
 
         $('#content').on('click', 'a.sidebar-content', function(e) {
             e.preventDefault();
-            Omeka.openSidebar($(this));
+            var sidebarSelector = $(this).data('sidebar-selector');
+            Omeka.openSidebar($(this), sidebarSelector);
         });
 
-        // Attach sidebar triggers
-        $('#content').on('click', 'a.sidebar-confirm', function(e) {
+        $('#content').on('click', '.button.delete, button.delete', function(e) {
             e.preventDefault();
             Omeka.openSidebar($(this), '#delete');
         });
 
+        if ($('.always-open.sidebar').length > 0) {
+            $('#content').addClass('sidebar-open');
+        }
+
+        $('.sidebar').find('.sidebar-close').click(function(e) {
+            e.preventDefault();
+            Omeka.closeSidebar($(this));
+        });
+
+        // Open sidebars on mobile
+        $('button.mobile-only').on('click', function(e) {
+            e.preventDefault();
+            var mobileButton = $(this);
+            var sidebarId = mobileButton.attr('id');
+            sidebarId = '#' + sidebarId.replace('-button', '');
+            $(sidebarId).addClass('active');
+            mobileButton.parents('form').bind('DOMSubtreeModified', function() {
+                $('.sidebar.always-open').removeClass('active');
+                $(this).unbind('DOMSubtreeModified');
+            });
+        });
+
         // Make resource public or private
         $('#content').on('click', 'a.o-icon-private, a.o-icon-public', function(e) {
             e.preventDefault();
@@ -152,15 +164,6 @@ var Omeka = {
             }
         });
 
-        if ($('.active.sidebar').length > 0) {
-            $('#content').addClass('sidebar-open');
-        }
-
-        $('.sidebar').find('.sidebar-close').click(function(e) {
-            e.preventDefault();
-            Omeka.closeSidebar($(this));
-        });
-
         // Skip to content button. See http://www.bignerdranch.com/blog/web-accessibility-skip-navigation-links/
         $('.skip').click(function(e) {
             $('#main').attr('tabindex', -1).on('blur focusout', function() {
@@ -261,7 +264,7 @@ var Omeka = {
         $('#search-form').change(Omeka.updateSearch);
         Omeka.updateSearch();
     });
-    
+
     $(window).load(function() {
         var setSubmittedFlag = function () {
             $(this).data('omekaFormSubmitted', true);
@@ -277,12 +280,16 @@ var Omeka = {
             var preventNav = false;
             $('form[method=POST]').each(function () {
                 var form = $(this);
+                var originalData = form.data('omekaFormOriginalData');
                 if (form.data('omekaFormSubmitted')) {
                     return;
                 }
 
                 form.trigger('o:before-form-unload');
-                if (form.data('omekaFormDirty') || form.data('omekaFormOriginalData') !== form.serialize()) {
+
+                if (form.data('omekaFormDirty')
+                    || (originalData && originalData !== form.serialize())
+                ) {
                     preventNav = true;
                     return false;
                 }

diff --git a/application/asset/js/resource-form.js b/application/asset/js/resource-form.js
@@ -1,18 +1,6 @@
 (function($) {
 
     $(document).ready( function() {
-        // Open sidebars on mobile
-        $('button.mobile-only').on('click', function(e) {
-            e.preventDefault();
-            var mobileButton = $(this);
-            var sidebarId = mobileButton.attr('id');
-            sidebarId = sidebarId.replace('-button', '');
-            $('#' + sidebarId).addClass('mobile');
-            mobileButton.parents('form').bind('DOMSubtreeModified', function() {
-                $('.sidebar.active.mobile').removeClass('mobile');
-                $(this).unbind('DOMSubtreeModified');
-            });
-        });
 
         // Select property
         $('#property-selector li.selector-child').on('click', function(e) {
@@ -98,6 +86,7 @@
             var valueObj = $('.resource-details').data('resource-values');
             var namePrefix = value.data('name-prefix');
             prepareResource(value, valueObj, namePrefix);
+            Omeka.closeSidebar($('#select-resource .sidebar-close'));
         });
 
         $('.button.resource-select').on('click', function(e) {

diff --git a/application/asset/js/resource-selector.js b/application/asset/js/resource-selector.js
@@ -31,7 +31,6 @@
             e.preventDefault();
             var context = $(this);
             Omeka.closeSidebar(context);
-            context.parents('.mobile').removeClass('mobile');
             context.trigger('o:resource-selected');
         });
 

diff --git a/application/asset/sass/_screen.scss b/application/asset/sass/_screen.scss
@@ -802,6 +802,10 @@ nav.pagination + *:not(.sorting) {
         content: $fa-var-gears;
     }
 
+    #menu a.theme:before {
+        content: $fa-var-paint-brush;
+    }
+
     /* @end */
 
 /* @end */
@@ -2297,6 +2301,7 @@ input[type="text"].value-language,
     position: fixed;
     top: rhythm(3.5);
     left: 100%;
+    visibility: hidden;
     bottom: 0;
     background-color: #f7f7f7;
     z-index: 3;
@@ -2307,8 +2312,10 @@ input[type="text"].value-language,
     width: span(4 of 16) - gutter(32);
     @include transition-duration(.5s);
 
-    &.active {
+    &.active,
+    &.always-open {
         left: span(12 of 16) + gutter(32);
+        visibility: visible;
     }
 
     .o-icon-close {

diff --git a/application/asset/sass/_tablet.scss b/application/asset/sass/_tablet.scss
@@ -223,11 +223,11 @@ body.sidebar-open #content {
     width: 100%;
 }
 
-.sidebar.active {
+.sidebar.always-open {
     left: 100%;
 }
 
-.sidebar.mobile.active,
+.sidebar.active,
 #resource-details.active #select-item,
 .confirm-panel {
     left: 0;

diff --git a/application/config/module.config.php b/application/config/module.config.php
@@ -250,12 +250,14 @@
             'itemSetSelect'          => 'Omeka\View\Helper\ItemSetSelect',
             'formPropertyInputs'     => 'Omeka\View\Helper\PropertyInputs',
             'resourceClassSelect'    => 'Omeka\View\Helper\ResourceClassSelect',
+            'deleteConfirm'          => 'Omeka\View\Helper\DeleteConfirm',
             'searchFilters' => 'Omeka\View\Helper\SearchFilters',
             'ckEditor' => 'Omeka\View\Helper\CkEditor',
             'sitePagePagination' => 'Omeka\View\Helper\SitePagePagination',
         ],
         'factories' => [
             'assetUrl' => 'Omeka\Service\ViewHelperAssetUrlFactory',
+            'themeSetting' => 'Omeka\Service\ViewHelperThemeSettingFactory',
         ],
     ],
     'data_types' => [
@@ -273,7 +275,8 @@
             'tableOfContents' => 'Omeka\Site\BlockLayout\TableOfContents',
             'fileWithText' => 'Omeka\Site\BlockLayout\FileWithText',
             'file' => 'Omeka\Site\BlockLayout\File',
-            'lineBreak' => 'Omeka\Site\BlockLayout\LineBreak'
+            'lineBreak' => 'Omeka\Site\BlockLayout\LineBreak',
+            'itemWithMetadata' => 'Omeka\Site\BlockLayout\ItemWithMetadata',
         ],
     ],
     'navigation_links' => [

diff --git a/application/config/navigation.config.php b/application/config/navigation.config.php
@@ -2,6 +2,13 @@
 return [
     'navigation' => [
         'admin' => [
+            [
+                'label'      => 'Sites',
+                'class'      => 'sites',
+                'route'      => 'admin/site',
+                'resource'   => 'Omeka\Controller\SiteAdmin\Index',
+                'privilege'  => 'index',
+            ],
             [
                 'label'      => 'Items',
                 'class'      => 'items',
@@ -105,13 +112,6 @@
                 'resource'   => 'Omeka\Controller\Admin\Job',
                 'privilege'  => 'browse',
             ],
-            [
-                'label'      => 'Sites',
-                'class'      => 'sites',
-                'route'      => 'admin/site',
-                'resource'   => 'Omeka\Controller\SiteAdmin\Index',
-                'privilege'  => 'index',
-            ],
             [
                 'label'      => 'Settings',
                 'class'      => 'settings',
@@ -189,6 +189,13 @@
                 'action'        => 'users',
                 'useRouteMatch' => true
             ],
+            [
+                'label'         => 'Theme',
+                'class'         => 'theme',
+                'route'         => 'admin/site/default',
+                'action'        => 'theme',
+                'useRouteMatch' => true
+            ],
             [
                 'label'         => 'Settings',
                 'class'         => 'settings',