From c7c2bf214c9cf6bde0c563ee68ffb5b61ed9734e Mon Sep 17 00:00:00 2001 From: Bernhard Posselt Date: Wed, 27 Aug 2014 18:52:13 +0200 Subject: editing --- css/navigation.css | 108 +-------------------- js/app/Run.js | 1 + js/build/app.js | 40 +++++++- js/directive/AppNavigationEntryUtils.js | 38 ++++++++ js/directive/NewsAutoFocus.js | 6 +- js/directive/NewsFocus.js | 4 +- .../unit/controller/NavigationControllerSpec.js | 2 + templates/part.addnew.php | 1 + templates/part.feed.unread.php | 2 +- templates/part.listfeed.php | 84 ++++++---------- 10 files changed, 118 insertions(+), 168 deletions(-) create mode 100644 js/directive/AppNavigationEntryUtils.js diff --git a/css/navigation.css b/css/navigation.css index de0b39c9f..e19e6a594 100644 --- a/css/navigation.css +++ b/css/navigation.css @@ -117,118 +117,14 @@ padding-right: 0px; } -.folder { +#app-navigation .folder { text-transform: uppercase; } -.feed { +#app-navigation .feed { text-transform: none; } -#app-navigation li:hover > .utils { - display: block; -} - -#app-navigation li:hover > .utils .unread-counter { - padding-left: 0; -} - #app-navigation .folder-input { text-transform: uppercase; } - -.rename-feed input { - margin: 1px 0 0px 5px; - border-right: 1px solid #ddd; - border-radius: 2px; - border-top-right-radius: 0; - border-bottom-right-radius: 0; - border-right: 0; - width: 208px; - height: 32px; -} - -.rename-feed button { - margin: 5px 0 5px 0; - display: inline-block; - border-bottom-left-radius: 0; - border-top-left-radius: 0; - width: 30px !important; - height: 30px !important; - padding: 0.6em; -} - -.rename-feed .action-button { - background-position: center; - background-repeat: no-repeat; -} - -.rename-feed .back-button { - border-radius: 3px; - background-image: url('../img/delete.svg'); -} - -.rename-feed .create-button { - border-radius: 0; - background-image: url('../img/mark_read.svg'); -} - -.rss-icon { - background-image: url('../img/rss.svg'); -} - -#app-navigation .ui-draggable-dragging { - width: 100%; -} - -#app-navigation .multiselect { - height:20px; -} - -#app-navigation .progress-icon, -#app-navigation .problem-icon { - width: 299px; - line-height: 44px; -} - -.progress-icon { - background-image: url('../img/loading.gif'); -} - -.problem-icon { - background-image: url('../img/problem.svg') !important; -} - -.failed { - background-color: #F2FF63 !important; - text-shadow: none !important; - font-weight: bold; -} - - .failed .title { - background-color: #F2FF63 !important; - width: 299px !important; - text-overflow: ellipsis; - white-space: nowrap; - overflow: hidden; - display: inline-block !important; - } - - .failed a:hover, - .failed:hover a { - background-color: #F2FF63 !important; - } - - .failed .message { - font-weight: normal; - padding: 5px 20px 5px 32px; - } - - .folder .feed.failed .message { - padding-left: 48px; - } - -.tooltip { - text-shadow: none; - text-transform: none; -} \ No newline at end of file diff --git a/js/app/Run.js b/js/app/Run.js index 44c01a5e5..9b068910c 100644 --- a/js/app/Run.js +++ b/js/app/Run.js @@ -105,4 +105,5 @@ app.run(($rootScope, $location, $http, $q, $interval, Loading, ItemResource, $rootScope.$on('$routeChangeError', () => { $location.path('/items'); }); + }); \ No newline at end of file diff --git a/js/build/app.js b/js/build/app.js index a3a749132..c718e3c2c 100644 --- a/js/build/app.js +++ b/js/build/app.js @@ -1536,6 +1536,35 @@ var $__build_47_app__ = function () { writable: true }), $__2; }; + app.run([ + '$document', + '$rootScope', + function ($document, $rootScope) { + 'use strict'; + $document.click(function (event) { + $rootScope.$broadcast('documentClicked', event); + }); + } + ]); + app.directive('appNavigationEntryUtils', function () { + 'use strict'; + return { + restrict: 'C', + link: function (scope, elm) { + var menu = elm.siblings('.app-navigation-entry-menu'); + menu.hide(); + var button = $(elm).find('.app-navigation-entry-utils-menu-button button'); + button.click(function () { + menu.toggle(); + }); + scope.$on('documentClicked', function (scope, event) { + if (event.target !== button[0]) { + menu.hide(); + } + }); + } + }; + }); app.directive('newsAudio', function () { 'use strict'; return { @@ -1563,7 +1592,11 @@ var $__build_47_app__ = function () { app.directive('newsAutoFocus', function () { 'use strict'; return function (scope, elem, attrs) { - $(attrs.newsAutofocus).focus(); + if (attrs.newsAutofocus) { + $(attrs.newsAutofocus).focus(); + } else { + elem.focus(); + } }; }); app.directive('newsBindHtmlUnsafe', function () { @@ -1610,11 +1643,12 @@ var $__build_47_app__ = function () { ]); app.directive('newsFocus', [ '$timeout', - function ($timeout) { + '$interpolate', + function ($timeout, $interpolate) { 'use strict'; return function (scope, elem, attrs) { elem.click(function () { - var toReadd = $(attrs.newsFocus); + var toReadd = $($interpolate(attrs.newsFocus)(scope)); $timeout(function () { toReadd.focus(); }, 500); diff --git a/js/directive/AppNavigationEntryUtils.js b/js/directive/AppNavigationEntryUtils.js new file mode 100644 index 000000000..8deb09b61 --- /dev/null +++ b/js/directive/AppNavigationEntryUtils.js @@ -0,0 +1,38 @@ +/** + * ownCloud - News + * + * This file is licensed under the Affero General Public License version 3 or + * later. See the COPYING file. + * + * @author Bernhard Posselt + * @copyright Bernhard Posselt 2014 + */ +app.run(($document, $rootScope) => { + 'use strict'; + $document.click((event) => { + $rootScope.$broadcast('documentClicked', event); + }); +}); + +app.directive('appNavigationEntryUtils', () => { + 'use strict'; + return { + restrict: 'C', + link: (scope, elm) => { + let menu = elm.siblings('.app-navigation-entry-menu'); + menu.hide(); + let button = $(elm) + .find('.app-navigation-entry-utils-menu-button button'); + + button.click(() => { + menu.toggle(); + }); + + scope.$on('documentClicked', (scope, event) => { + if (event.target !== button[0]) { + menu.hide(); + } + }); + } + }; +}); \ No newline at end of file diff --git a/js/directive/NewsAutoFocus.js b/js/directive/NewsAutoFocus.js index a66f4453c..e66f7b3bf 100644 --- a/js/directive/NewsAutoFocus.js +++ b/js/directive/NewsAutoFocus.js @@ -11,7 +11,11 @@ app.directive('newsAutoFocus', () => { 'use strict'; return (scope, elem, attrs) => { - $(attrs.newsAutofocus).focus(); + if (attrs.newsAutofocus) { + $(attrs.newsAutofocus).focus(); + } else { + elem.focus(); + } }; }); \ No newline at end of file diff --git a/js/directive/NewsFocus.js b/js/directive/NewsFocus.js index 3ab2a85aa..f5133fd20 100644 --- a/js/directive/NewsFocus.js +++ b/js/directive/NewsFocus.js @@ -7,12 +7,12 @@ * @author Bernhard Posselt * @copyright Bernhard Posselt 2014 */ -app.directive('newsFocus', ($timeout) => { +app.directive('newsFocus', ($timeout, $interpolate) => { 'use strict'; return (scope, elem, attrs) => { elem.click(() => { - let toReadd = $(attrs.newsFocus); + let toReadd = $($interpolate(attrs.newsFocus)(scope)); $timeout(() => { toReadd.focus(); }, 500); diff --git a/js/tests/unit/controller/NavigationControllerSpec.js b/js/tests/unit/controller/NavigationControllerSpec.js index 6837160bf..1cfbb4012 100644 --- a/js/tests/unit/controller/NavigationControllerSpec.js +++ b/js/tests/unit/controller/NavigationControllerSpec.js @@ -278,4 +278,6 @@ describe('NavigationController', () => { expect(ctrl.isFolderActive(3)).toBe(true); })); + + }); diff --git a/templates/part.addnew.php b/templates/part.addnew.php index 6afc0f40f..5bc48b23d 100644 --- a/templates/part.addnew.php +++ b/templates/part.addnew.php @@ -34,6 +34,7 @@ ng-model="folderName" placeholder="t('Folder-Name')); ?>" name="folderName" + class="folder-input" ng-if="Navigation.newFolder"> diff --git a/templates/part.listfeed.php b/templates/part.listfeed.php index 1c5cc3bc3..3673c4958 100644 --- a/templates/part.listfeed.php +++ b/templates/part.listfeed.php @@ -20,82 +20,56 @@ revert: true }"> -
- - - -
- - {{ feed.title }} -
+
+ + + +
+ +
  • + ng-show="feed.id && Navigation.getUnreadCount(feed.id) > 0"> {{ Navigation.getFeedUnreadCount(feed.id) | unreadCountFormatter }}
    • -
    • +
  • + +
-
+
    -
    • -
    • -
    • +
    • +
    • +
- - - - - -
{{ feed.error }}
-- cgit v1.2.3