diff options
| author | raimund-schluessler <raimund.schluessler@googlemail.com> | 2014-07-30 23:03:54 +0400 |
|---|---|---|
| committer | raimund-schluessler <raimund.schluessler@googlemail.com> | 2014-07-30 23:03:54 +0400 |
| commit | 1093619ba66c4cf73e0eef649c04fdd4f6119b1a (patch) | |
| tree | 9c806d1ec0d8e1c58581f0b5deda5b4808b16f66 | |
| parent | f5d3863c925a9ae156fe853855f74289ba89294b (diff) | |
Rename to Tasks, closes #51
27 files changed, 301 insertions, 301 deletions
@@ -1,4 +1,4 @@ -tasks_enhanced +tasks ============== -Enhanced task app for ownCloud +Task app for ownCloud diff --git a/appinfo/app.php b/appinfo/app.php index 7c08720d..0539059a 100644 --- a/appinfo/app.php +++ b/appinfo/app.php @@ -20,14 +20,14 @@ * License along with this library. If not, see <http://www.gnu.org/licenses/>. * */ -namespace OCA\Tasks_enhanced; +namespace OCA\Tasks; use \OC\AppFramework\Core\API; // dont break owncloud when the appframework is not enabled if(\OCP\App::isEnabled('calendar')){ - // $api = new API('tasks_enhanced'); + // $api = new API('tasks'); // $api->addNavigationEntry(array( @@ -39,7 +39,7 @@ if(\OCP\App::isEnabled('calendar')){ // 'order' => 100, // // the route that will be shown on startup -// 'href' => $api->linkToRoute('tasks_enhanced_index'), +// 'href' => $api->linkToRoute('tasks_index'), // // the icon that will be shown in the navigation // // this file needs to exist in img/example.png @@ -53,15 +53,15 @@ if(\OCP\App::isEnabled('calendar')){ // )); \OC::$server->getNavigationManager()->add(array( - 'id' => 'tasks_enhanced', + 'id' => 'tasks', 'order' => 100, - 'href' => \OCP\Util::linkToRoute('tasks_enhanced_index'), - 'icon' => \OCP\Util::imagePath( 'tasks_enhanced', 'tasks.svg' ), - 'name' => \OCP\Util::getL10N('tasks_enhanced')->t('Tasks') + 'href' => \OCP\Util::linkToRoute('tasks_index'), + 'icon' => \OCP\Util::imagePath( 'tasks', 'tasks.svg' ), + 'name' => \OCP\Util::getL10N('tasks')->t('Tasks') ) ); } else { $msg = 'Can not enable the Tasks app because the Calendar App is disabled.'; - \OCP\Util::writeLog('tasks_enhanced', $msg, \OCP\Util::ERROR); + \OCP\Util::writeLog('tasks', $msg, \OCP\Util::ERROR); }
\ No newline at end of file diff --git a/appinfo/info.xml b/appinfo/info.xml index 634322ef..755ec688 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -1,11 +1,11 @@ <?xml version="1.0"?> <info> - <id>tasks_enhanced</id> + <id>tasks</id> <name>Tasks</name> <version>0.4.1</version> <licence>AGPL</licence> <author>Raimund Schlüßler</author> <require>6.0.0</require> <shipped>true</shipped> - <description>Enhanced Task App for Calender TODOs</description> + <description>Task App for Calender TODOs</description> </info> diff --git a/appinfo/routes.php b/appinfo/routes.php index 9af9e280..3bb58214 100644 --- a/appinfo/routes.php +++ b/appinfo/routes.php @@ -19,12 +19,12 @@ * License along with this library. If not, see <http://www.gnu.org/licenses/>. * */ -namespace OCA\Tasks_enhanced; +namespace OCA\Tasks; -use OCA\Tasks_enhanced\Dispatcher; +use OCA\Tasks\Dispatcher; //define the routes -$this->create('tasks_enhanced_index', '/') +$this->create('tasks_index', '/') ->get() ->action( function($params){ diff --git a/js/app/app.coffee b/js/app/app.coffee index 1510deae..357a37af 100644 --- a/js/app/app.coffee +++ b/js/app/app.coffee @@ -80,43 +80,43 @@ angular.module('Tasks').run ['Config', '$timeout', moment.lang('details', { calendar: { - lastDay : '['+t('tasks_enhanced','Due yesterday')+'], HH:mm' - sameDay : '['+t('tasks_enhanced','Due today')+'], HH:mm' - nextDay : '['+t('tasks_enhanced','Due tomorrow')+'], HH:mm' - lastWeek : '['+t('tasks_enhanced', 'Due on')+'] MMM DD, YYYY, HH:mm' - nextWeek : '['+t('tasks_enhanced', 'Due on')+'] MMM DD, YYYY, HH:mm' - sameElse : '['+t('tasks_enhanced', 'Due on')+'] MMM DD, YYYY, HH:mm' + lastDay : '['+t('tasks','Due yesterday')+'], HH:mm' + sameDay : '['+t('tasks','Due today')+'], HH:mm' + nextDay : '['+t('tasks','Due tomorrow')+'], HH:mm' + lastWeek : '['+t('tasks', 'Due on')+'] MMM DD, YYYY, HH:mm' + nextWeek : '['+t('tasks', 'Due on')+'] MMM DD, YYYY, HH:mm' + sameElse : '['+t('tasks', 'Due on')+'] MMM DD, YYYY, HH:mm' } }) moment.lang('start', { calendar: { - lastDay : '['+t('tasks_enhanced','Started yesterday')+'], HH:mm' - sameDay : '['+t('tasks_enhanced','Starts today')+'], HH:mm' - nextDay : '['+t('tasks_enhanced','Starts tomorrow')+'], HH:mm' - lastWeek : '['+t('tasks_enhanced', 'Started on')+'] MMM DD, YYYY, HH:mm' - nextWeek : '['+t('tasks_enhanced', 'Starts on')+'] MMM DD, YYYY, HH:mm' + lastDay : '['+t('tasks','Started yesterday')+'], HH:mm' + sameDay : '['+t('tasks','Starts today')+'], HH:mm' + nextDay : '['+t('tasks','Starts tomorrow')+'], HH:mm' + lastWeek : '['+t('tasks', 'Started on')+'] MMM DD, YYYY, HH:mm' + nextWeek : '['+t('tasks', 'Starts on')+'] MMM DD, YYYY, HH:mm' sameElse : () -> if this.diff(moment()) > 0 - '['+t('tasks_enhanced', 'Starts on')+'] MMM DD, YYYY, HH:mm' + '['+t('tasks', 'Starts on')+'] MMM DD, YYYY, HH:mm' else - '['+t('tasks_enhanced', 'Started on')+'] MMM DD, YYYY, HH:mm' + '['+t('tasks', 'Started on')+'] MMM DD, YYYY, HH:mm' } }) moment.lang('reminder', { calendar: { - lastDay : t('tasks_enhanced', '[Remind me yesterday at ]HH:mm') - sameDay : t('tasks_enhanced', '[Remind me today at ]HH:mm') - nextDay : t('tasks_enhanced', '[Remind me tomorrow at ]HH:mm') - lastWeek : t('tasks_enhanced', '[Remind me on ]MMM DD, YYYY,[ at ]HH:mm') - nextWeek : t('tasks_enhanced', '[Remind me on ]MMM DD, YYYY,[ at ]HH:mm') - sameElse : t('tasks_enhanced', '[Remind me on ]MMM DD, YYYY,[ at ]HH:mm') + lastDay : t('tasks', '[Remind me yesterday at ]HH:mm') + sameDay : t('tasks', '[Remind me today at ]HH:mm') + nextDay : t('tasks', '[Remind me tomorrow at ]HH:mm') + lastWeek : t('tasks', '[Remind me on ]MMM DD, YYYY,[ at ]HH:mm') + nextWeek : t('tasks', '[Remind me on ]MMM DD, YYYY,[ at ]HH:mm') + sameElse : t('tasks', '[Remind me on ]MMM DD, YYYY,[ at ]HH:mm') } }) moment.lang('tasks', { calendar: { - lastDay : '['+t('tasks_enhanced','Yesterday')+']' - sameDay : '['+t('tasks_enhanced','Today')+']' - nextDay : '['+t('tasks_enhanced','Tomorrow')+']' + lastDay : '['+t('tasks','Yesterday')+']' + sameDay : '['+t('tasks','Today')+']' + nextDay : '['+t('tasks','Tomorrow')+']' lastWeek : 'DD.MM.YYYY' nextWeek : 'DD.MM.YYYY' sameElse : 'DD.MM.YYYY' @@ -124,9 +124,9 @@ angular.module('Tasks').run ['Config', '$timeout', }) moment.lang('details_short', { calendar: { - lastDay : '['+t('tasks_enhanced','Yesterday')+']' - sameDay : '['+t('tasks_enhanced','Today')+']' - nextDay : '['+t('tasks_enhanced','Tomorrow')+']' + lastDay : '['+t('tasks','Yesterday')+']' + sameDay : '['+t('tasks','Today')+']' + nextDay : '['+t('tasks','Tomorrow')+']' lastWeek : 'MMM DD, YYYY' nextWeek : 'MMM DD, YYYY' sameElse : 'MMM DD, YYYY' @@ -134,9 +134,9 @@ angular.module('Tasks').run ['Config', '$timeout', }) moment.lang('list_week', { calendar: { - lastDay : '['+t('tasks_enhanced','Yesterday')+']' - sameDay : '['+t('tasks_enhanced','Today')+'], MMM. DD' - nextDay : '['+t('tasks_enhanced','Tomorrow')+'], MMM. DD' + lastDay : '['+t('tasks','Yesterday')+']' + sameDay : '['+t('tasks','Today')+'], MMM. DD' + nextDay : '['+t('tasks','Tomorrow')+'], MMM. DD' lastWeek : 'ddd, MMM. DD' nextWeek : 'ddd, MMM. DD' sameElse : 'ddd, MMM. DD' @@ -144,19 +144,19 @@ angular.module('Tasks').run ['Config', '$timeout', }) moment.lang('en', { relativeTime: { - future: t('tasks_enhanced', "in %s") - past: t('tasks_enhanced', "%s ago") - s: t('tasks_enhanced', "seconds") - m: t('tasks_enhanced', "a minute") - mm: t('tasks_enhanced', "%d minutes") - h: t('tasks_enhanced', "an hour") - hh: t('tasks_enhanced', "%d hours") - d: t('tasks_enhanced', "a day") - dd: t('tasks_enhanced', "%d days") - M: t('tasks_enhanced', "a month") - MM: t('tasks_enhanced', "%d months") - y: t('tasks_enhanced', "a year") - yy: t('tasks_enhanced', "%d years") + future: t('tasks', "in %s") + past: t('tasks', "%s ago") + s: t('tasks', "seconds") + m: t('tasks', "a minute") + mm: t('tasks', "%d minutes") + h: t('tasks', "an hour") + hh: t('tasks', "%d hours") + d: t('tasks', "a day") + dd: t('tasks', "%d days") + M: t('tasks', "a month") + MM: t('tasks', "%d months") + y: t('tasks', "a year") + yy: t('tasks', "%d years") } }) ]
\ No newline at end of file diff --git a/js/app/controllers/detailscontroller.coffee b/js/app/controllers/detailscontroller.coffee index 257767bd..1a3db94e 100644 --- a/js/app/controllers/detailscontroller.coffee +++ b/js/app/controllers/detailscontroller.coffee @@ -44,24 +44,24 @@ $timeout, $routeParams, SettingsModel) -> @_$scope.durations = [ { - name: t('tasks_enhanced','week'), - names: t('tasks_enhanced','weeks'), + name: t('tasks','week'), + names: t('tasks','weeks'), id: 'week'}, { - name: t('tasks_enhanced','day'), - names: t('tasks_enhanced','days'), + name: t('tasks','day'), + names: t('tasks','days'), id: 'day'}, { - name: t('tasks_enhanced','hour'), - names: t('tasks_enhanced','hours'), + name: t('tasks','hour'), + names: t('tasks','hours'), id: 'hour'}, { - name: t('tasks_enhanced','minute'), - names: t('tasks_enhanced','minutes'), + name: t('tasks','minute'), + names: t('tasks','minutes'), id: 'minute'}, { - name: t('tasks_enhanced','second'), - names: t('tasks_enhanced','seconds'), + name: t('tasks','second'), + names: t('tasks','seconds'), id: 'second'} ] @@ -70,22 +70,22 @@ $timeout, $routeParams, SettingsModel) -> @_$scope.params = (task) -> params = [ { - name: t('tasks_enhanced','before beginning'), + name: t('tasks','before beginning'), invert: true related:'START', id: "10"}, { - name: t('tasks_enhanced','after beginning'), + name: t('tasks','after beginning'), invert: false related:'START', id: "00"}, { - name: t('tasks_enhanced','before end'), + name: t('tasks','before end'), invert: true related:'END', id: "11"}, { - name: t('tasks_enhanced','after end'), + name: t('tasks','after end'), invert: false related:'END', id: "01"} @@ -320,8 +320,8 @@ $timeout, $routeParams, SettingsModel) -> @_$scope.commentStrings = () -> { - button: t('tasks_enhanced','Comment'), - input: t('tasks_enhanced','Add a comment') + button: t('tasks','Comment'), + input: t('tasks','Add a comment') } diff --git a/js/app/controllers/listcontroller.coffee b/js/app/controllers/listcontroller.coffee index 0b61733b..7e6f6712 100644 --- a/js/app/controllers/listcontroller.coffee +++ b/js/app/controllers/listcontroller.coffee @@ -43,7 +43,7 @@ CollectionsModel, ListsBusinessLayer, $location) -> @_$scope.deleteList = (listID) -> - really = confirm(t('tasks_enhanced', + really = confirm(t('tasks', 'This will delete the Calendar "%s" and all of its entries.') .replace('%s',_$listsmodel.getById(_$scope.route.listID).displayname)) if really @@ -85,11 +85,11 @@ CollectionsModel, ListsBusinessLayer, $location) -> _$scope.status.newListName = '' else - alert(t('tasks_enhanced', + alert(t('tasks', 'The name "%s" is already used.') .replace('%s',_$scope.status.newListName)) else - alert(t('tasks_enhanced', + alert(t('tasks', 'An empty name ist not allowed.')) @_$scope.editName = (listID) -> @@ -116,11 +116,11 @@ CollectionsModel, ListsBusinessLayer, $location) -> _$listsbusinesslayer.setListName(_$scope.route.listID) _$scope.endEditList() else - alert(t('tasks_enhanced', + alert(t('tasks', 'The name "%s" is already used.') .replace('%s',name)) else - alert(t('tasks_enhanced', + alert(t('tasks', 'An empty name ist not allowed.')) @_$scope.endEditList = () -> diff --git a/js/app/controllers/settingscontroller.coffee b/js/app/controllers/settingscontroller.coffee index 533f981f..2c78e02f 100644 --- a/js/app/controllers/settingscontroller.coffee +++ b/js/app/controllers/settingscontroller.coffee @@ -40,37 +40,37 @@ angular.module('Tasks').controller 'SettingsController', @_$scope.collectionOptions = [ { id: 0, - name: t('tasks_enhanced','Hidden')}, + name: t('tasks','Hidden')}, { id: 1, - name: t('tasks_enhanced','Visible')}, + name: t('tasks','Visible')}, { id: 2, - name: t('tasks_enhanced','Automatic')} + name: t('tasks','Automatic')} ] @_$scope.startOfWeekOptions = [ { id: 0, - name: t('tasks_enhanced','Sunday')}, + name: t('tasks','Sunday')}, { id: 1, - name: t('tasks_enhanced','Monday')}, + name: t('tasks','Monday')}, { id: 2, - name: t('tasks_enhanced','Tuesday')}, + name: t('tasks','Tuesday')}, { id: 3, - name: t('tasks_enhanced','Wednesday')}, + name: t('tasks','Wednesday')}, { id: 4, - name: t('tasks_enhanced','Thursday')}, + name: t('tasks','Thursday')}, { id: 5, - name: t('tasks_enhanced','Friday')}, + name: t('tasks','Friday')}, { id: 6, - name: t('tasks_enhanced','Saturday')} + name: t('tasks','Saturday')} ] @_$scope.ok = () => diff --git a/js/app/controllers/taskscontroller.coffee b/js/app/controllers/taskscontroller.coffee index c717d7a2..bd41f464 100644 --- a/js/app/controllers/taskscontroller.coffee +++ b/js/app/controllers/taskscontroller.coffee @@ -51,22 +51,22 @@ SettingsBusinessLayer) -> _$listsmodel.getById(_$listsmodel.getStandardList())) switch _$scope.route.listID when 'starred' - return t('tasks_enhanced','Add an important item in "%s"...') + return t('tasks','Add an important item in "%s"...') .replace('%s',list.displayname) when 'today' - return t('tasks_enhanced','Add an item due today in "%s"...') + return t('tasks','Add an item due today in "%s"...') .replace('%s',list.displayname) when 'all' - return t('tasks_enhanced','Add an entry in "%s"...') + return t('tasks','Add an entry in "%s"...') .replace('%s',list.displayname) when 'current' - return t('tasks_enhanced','Add a current entry in "%s"...') + return t('tasks','Add a current entry in "%s"...') .replace('%s',list.displayname) when 'completed', 'week' return null else if angular.isDefined(_$listsmodel.getById(_$scope.route.listID)) - return t('tasks_enhanced','Add an entry in "%s"...') + return t('tasks','Add an entry in "%s"...') .replace('%s', _$listsmodel.getById(_$scope.route.listID).displayname) diff --git a/js/app/directives/timepicker.coffee b/js/app/directives/timepicker.coffee index 7411d906..0232b0f3 100644 --- a/js/app/directives/timepicker.coffee +++ b/js/app/directives/timepicker.coffee @@ -28,6 +28,6 @@ angular.module('Tasks').directive 'timepicker', -> scope.$apply() myPosition: 'center top' atPosition: 'center bottom' - hourText: t('tasks_enhanced','Hours') - minuteText: t('tasks_enhanced','Minutes') + hourText: t('tasks','Hours') + minuteText: t('tasks','Minutes') })
\ No newline at end of file diff --git a/js/app/filters/dateDetails.coffee b/js/app/filters/dateDetails.coffee index 93bd4231..6cb34143 100644 --- a/js/app/filters/dateDetails.coffee +++ b/js/app/filters/dateDetails.coffee @@ -24,4 +24,4 @@ angular.module('Tasks').filter 'dateDetails', () -> if moment(due, "YYYYMMDDTHHmmss").isValid() return moment(due, "YYYYMMDDTHHmmss").lang('details').calendar() else - return t('tasks_enhanced', 'Set due date')
\ No newline at end of file + return t('tasks', 'Set due date')
\ No newline at end of file diff --git a/js/app/filters/percentDetails.coffee b/js/app/filters/percentDetails.coffee index 98e5c50e..d909cc81 100644 --- a/js/app/filters/percentDetails.coffee +++ b/js/app/filters/percentDetails.coffee @@ -21,4 +21,4 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>. ### angular.module('Tasks').filter 'percentDetails', () -> (percent) -> - t('tasks_enhanced', '%s % completed').replace('%s',percent)
\ No newline at end of file + t('tasks', '%s % completed').replace('%s',percent)
\ No newline at end of file diff --git a/js/app/filters/reminderDetails.coffee b/js/app/filters/reminderDetails.coffee index f649e785..8cdba1cc 100644 --- a/js/app/filters/reminderDetails.coffee +++ b/js/app/filters/reminderDetails.coffee @@ -26,7 +26,7 @@ angular.module('Tasks').filter 'reminderDetails', () -> moment(reminder.date, "YYYYMMDDTHHmmss").isValid() return moment(reminder.date, "YYYYMMDDTHHmmss").lang('reminder').calendar() else if reminder.type == 'DURATION' && reminder.duration - ds = t('tasks_enhanced', 'Remind me') + ds = t('tasks', 'Remind me') for token in scope.durations if +reminder.duration[token.id] time = 1 @@ -37,22 +37,22 @@ angular.module('Tasks').filter 'reminderDetails', () -> ds+=token.names if !time if reminder.duration.params.related == 'END' - ds+= ' '+t('tasks_enhanced','at the end') + ds+= ' '+t('tasks','at the end') else - ds+= ' '+t('tasks_enhanced','at the beginning') + ds+= ' '+t('tasks','at the beginning') else if reminder.duration.params.invert if reminder.duration.params.related == 'END' - ds+= ' '+t('tasks_enhanced','before end') + ds+= ' '+t('tasks','before end') else - ds+= ' '+t('tasks_enhanced','before beginning') + ds+= ' '+t('tasks','before beginning') else if reminder.duration.params.related == 'END' - ds+= ' '+t('tasks_enhanced','after end') + ds+= ' '+t('tasks','after end') else - ds+= ' '+t('tasks_enhanced','after beginning') + ds+= ' '+t('tasks','after beginning') return ds else - return t('tasks_enhanced', 'Remind me') + return t('tasks', 'Remind me') else - return t('tasks_enhanced', 'Remind me')
\ No newline at end of file + return t('tasks', 'Remind me')
\ No newline at end of file diff --git a/js/app/filters/startDetails.coffee b/js/app/filters/startDetails.coffee index 5b2ec0a5..0fe5541e 100644 --- a/js/app/filters/startDetails.coffee +++ b/js/app/filters/startDetails.coffee @@ -24,4 +24,4 @@ angular.module('Tasks').filter 'startDetails', () -> if moment(due, "YYYYMMDDTHHmmss").isValid() return moment(due, "YYYYMMDDTHHmmss").lang('start').calendar() else - return t('tasks_enhanced', 'Set start date')
\ No newline at end of file + return t('tasks', 'Set start date')
\ No newline at end of file diff --git a/js/app/services/persistence.coffee b/js/app/services/persistence.coffee index dab98b69..64727f7c 100644 --- a/js/app/services/persistence.coffee +++ b/js/app/services/persistence.coffee @@ -60,7 +60,7 @@ angular.module('Tasks').factory 'Persistence', onSuccess: successCallbackWrapper onFailure: failureCallbackWrapper - @_request.get '/apps/tasks_enhanced/collections', params + @_request.get '/apps/tasks/collections', params getSettings: (onSuccess, showLoading=true) -> onSuccess or= -> @@ -81,7 +81,7 @@ angular.module('Tasks').factory 'Persistence', onSuccess: successCallbackWrapper onFailure: failureCallbackWrapper - @_request.get '/apps/tasks_enhanced/settings', params + @_request.get '/apps/tasks/settings', params setVisibility: (collectionID, visibility) -> params = @@ -89,7 +89,7 @@ angular.module('Tasks').factory 'Persistence', collectionID: collectionID visibility: visibility - @_request.post '/apps/tasks_enhanced/collection/ + @_request.post '/apps/tasks/collection/ {collectionID}/visibility/{visibility}', params setting: (type, setting, value) -> @@ -99,7 +99,7 @@ angular.module('Tasks').factory 'Persistence', setting: setting value: +value - @_request.post '/apps/tasks_enhanced/settings/ + @_request.post '/apps/tasks/settings/ {type}/{setting}/{value}', params @@ -125,7 +125,7 @@ angular.module('Tasks').factory 'Persistence', routeParams: request: which - @_request.get '/apps/tasks_enhanced/lists', params + @_request.get '/apps/tasks/lists', params addList: (list, onSuccess=null, onFailure=null) -> onSuccess or= -> @@ -137,7 +137,7 @@ angular.module('Tasks').factory 'Persistence', onSuccess: onSuccess onFailure: onFailure - @_request.post '/apps/tasks_enhanced/lists/add', params + @_request.post '/apps/tasks/lists/add', params setListName: (list) -> params = @@ -146,14 +146,14 @@ angular.module('Tasks').factory 'Persistence', data: name: list.displayname - @_request.post '/apps/tasks_enhanced/lists/{listID}/name', params + @_request.post '/apps/tasks/lists/{listID}/name', params deleteList: (listID) -> params = routeParams: listID: listID - @_request.post '/apps/tasks_enhanced/lists/{listID}/delete', params + @_request.post '/apps/tasks/lists/{listID}/delete', params getTasks: (onSuccess, showLoading=true) -> onSuccess or= -> @@ -174,28 +174,28 @@ angular.module('Tasks').factory 'Persistence', onSuccess: successCallbackWrapper onFailure: failureCallbackWrapper - @_request.get '/apps/tasks_enhanced/tasks', params + @_request.get '/apps/tasks/tasks', params starTask: (taskID) -> params = routeParams: taskID: taskID - @_request.post '/apps/tasks_enhanced/tasks/{taskID}/star', params + @_request.post '/apps/tasks/tasks/{taskID}/star', params unstarTask: (taskID) -> params = routeParams: taskID: taskID - @_request.post '/apps/tasks_enhanced/tasks/{taskID}/unstar', params + @_request.post '/apps/tasks/tasks/{taskID}/unstar', params completeTask: (taskID) -> params = routeParams: taskID: taskID - @_request.post '/apps/tasks_enhanced/tasks/{taskID}/complete', params + @_request.post '/apps/tasks/tasks/{taskID}/complete', params setPercentComplete: (taskID, complete) -> params = @@ -204,14 +204,14 @@ angular.module('Tasks').factory 'Persistence', data: complete: complete - @_request.post '/apps/tasks_enhanced/tasks/{taskID}/percentcomplete', params + @_request.post '/apps/tasks/tasks/{taskID}/percentcomplete', params uncompleteTask: (taskID) -> params = routeParams: taskID: taskID - @_request.post '/apps/tasks_enhanced/tasks/{taskID}/uncomplete', params + @_request.post '/apps/tasks/tasks/{taskID}/uncomplete', params addTask: (task, onSuccess=null, onFailure=null) -> onSuccess or= -> @@ -230,14 +230,14 @@ angular.module('Tasks').factory 'Persistence', onSuccess: onSuccess onFailure: onFailure - @_request.post '/apps/tasks_enhanced/tasks/add', params + @_request.post '/apps/tasks/tasks/add', params deleteTask: (taskID) -> params = routeParams: taskID: taskID - @_request.post '/apps/tasks_enhanced/tasks/{taskID}/delete', params + @_request.post '/apps/tasks/tasks/{taskID}/delete', params setDueDate: (taskID, due) -> params = @@ -246,7 +246,7 @@ angular.module('Tasks').factory 'Persistence', data: due: due - @_request.post '/apps/tasks_enhanced/tasks/{taskID}/due', params + @_request.post '/apps/tasks/tasks/{taskID}/due', params setStartDate: (taskID, start) -> params = @@ -255,7 +255,7 @@ angular.module('Tasks').factory 'Persistence', data: start: start - @_request.post '/apps/tasks_enhanced/tasks/{taskID}/start', params + @_request.post '/apps/tasks/tasks/{taskID}/start', params setReminder: (taskID, reminder) -> if reminder == false @@ -289,7 +289,7 @@ angular.module('Tasks').factory 'Persistence', else return - @_request.post '/apps/tasks_enhanced/tasks/{taskID}/reminder', params + @_request.post '/apps/tasks/tasks/{taskID}/reminder', params changeCalendarId: (taskID, calendarID) -> params = @@ -298,7 +298,7 @@ angular.module('Tasks').factory 'Persistence', data: calendarID: calendarID - @_request.post '/apps/tasks_enhanced/tasks/{taskID}/calendar', params + @_request.post '/apps/tasks/tasks/{taskID}/calendar', params setTaskName: (taskID, name) -> params = @@ -307,7 +307,7 @@ angular.module('Tasks').factory 'Persistence', data: name: name - @_request.post '/apps/tasks_enhanced/tasks/{taskID}/name', params + @_request.post '/apps/tasks/tasks/{taskID}/name', params setTaskNote: (taskID, note) -> params = @@ -316,14 +316,14 @@ angular.module('Tasks').factory 'Persistence', data: note: note - @_request.post '/apps/tasks_enhanced/tasks/{taskID}/note', params + @_request.post '/apps/tasks/tasks/{taskID}/note', params setShowHidden: (showHidden) -> params = routeParams: showHidden: +showHidden - @_request.post '/apps/tasks_enhanced/settings/showhidden/{showHidden}', + @_request.post '/apps/tasks/settings/showhidden/{showHidden}', params addComment: (comment, onSuccess=null, onFailure=null) -> @@ -336,7 +336,7 @@ angular.module('Tasks').factory 'Persistence', onSuccess: onSuccess onFailure: onFailure - @_request.post '/apps/tasks_enhanced/tasks/{taskID}/comment', + @_request.post '/apps/tasks/tasks/{taskID}/comment', params deleteComment: (taskID, commentID) -> @@ -345,7 +345,7 @@ angular.module('Tasks').factory 'Persistence', taskID: taskID commentID: commentID - @_request.post '/apps/tasks_enhanced/tasks/{taskID}/comment/ + @_request.post '/apps/tasks/tasks/{taskID}/comment/ {commentID}/delete', params return new Persistence(Request, Loading, $rootScope) diff --git a/js/public/app.js b/js/public/app.js index d3c8a949..3fd5140d 100644 --- a/js/public/app.js +++ b/js/public/app.js @@ -74,45 +74,45 @@ })(); moment.lang('details', { calendar: { - lastDay: '[' + t('tasks_enhanced', 'Due yesterday') + '], HH:mm', - sameDay: '[' + t('tasks_enhanced', 'Due today') + '], HH:mm', - nextDay: '[' + t('tasks_enhanced', 'Due tomorrow') + '], HH:mm', - lastWeek: '[' + t('tasks_enhanced', 'Due on') + '] MMM DD, YYYY, HH:mm', - nextWeek: '[' + t('tasks_enhanced', 'Due on') + '] MMM DD, YYYY, HH:mm', - sameElse: '[' + t('tasks_enhanced', 'Due on') + '] MMM DD, YYYY, HH:mm' + lastDay: '[' + t('tasks', 'Due yesterday') + '], HH:mm', + sameDay: '[' + t('tasks', 'Due today') + '], HH:mm', + nextDay: '[' + t('tasks', 'Due tomorrow') + '], HH:mm', + lastWeek: '[' + t('tasks', 'Due on') + '] MMM DD, YYYY, HH:mm', + nextWeek: '[' + t('tasks', 'Due on') + '] MMM DD, YYYY, HH:mm', + sameElse: '[' + t('tasks', 'Due on') + '] MMM DD, YYYY, HH:mm' } }); moment.lang('start', { calendar: { - lastDay: '[' + t('tasks_enhanced', 'Started yesterday') + '], HH:mm', - sameDay: '[' + t('tasks_enhanced', 'Starts today') + '], HH:mm', - nextDay: '[' + t('tasks_enhanced', 'Starts tomorrow') + '], HH:mm', - lastWeek: '[' + t('tasks_enhanced', 'Started on') + '] MMM DD, YYYY, HH:mm', - nextWeek: '[' + t('tasks_enhanced', 'Starts on') + '] MMM DD, YYYY, HH:mm', + lastDay: '[' + t('tasks', 'Started yesterday') + '], HH:mm', + sameDay: '[' + t('tasks', 'Starts today') + '], HH:mm', + nextDay: '[' + t('tasks', 'Starts tomorrow') + '], HH:mm', + lastWeek: '[' + t('tasks', 'Started on') + '] MMM DD, YYYY, HH:mm', + nextWeek: '[' + t('tasks', 'Starts on') + '] MMM DD, YYYY, HH:mm', sameElse: function() { if (this.diff(moment()) > 0) { - return '[' + t('tasks_enhanced', 'Starts on') + '] MMM DD, YYYY, HH:mm'; + return '[' + t('tasks', 'Starts on') + '] MMM DD, YYYY, HH:mm'; } else { - return '[' + t('tasks_enhanced', 'Started on') + '] MMM DD, YYYY, HH:mm'; + return '[' + t('tasks', 'Started on') + '] MMM DD, YYYY, HH:mm'; } } } }); moment.lang('reminder', { calendar: { - lastDay: t('tasks_enhanced', '[Remind me yesterday at ]HH:mm'), - sameDay: t('tasks_enhanced', '[Remind me today at ]HH:mm'), - nextDay: t('tasks_enhanced', '[Remind me tomorrow at ]HH:mm'), - lastWeek: t('tasks_enhanced', '[Remind me on ]MMM DD, YYYY,[ at ]HH:mm'), - nextWeek: t('tasks_enhanced', '[Remind me on ]MMM DD, YYYY,[ at ]HH:mm'), - sameElse: t('tasks_enhanced', '[Remind me on ]MMM DD, YYYY,[ at ]HH:mm') + lastDay: t('tasks', '[Remind me yesterday at ]HH:mm'), + sameDay: t('tasks', '[Remind me today at ]HH:mm'), + nextDay: t('tasks', '[Remind me tomorrow at ]HH:mm'), + lastWeek: t('tasks', '[Remind me on ]MMM DD, YYYY,[ at ]HH:mm'), + nextWeek: t('tasks', '[Remind me on ]MMM DD, YYYY,[ at ]HH:mm'), + sameElse: t('tasks', '[Remind me on ]MMM DD, YYYY,[ at ]HH:mm') } }); moment.lang('tasks', { calendar: { - lastDay: '[' + t('tasks_enhanced', 'Yesterday') + ']', - sameDay: '[' + t('tasks_enhanced', 'Today') + ']', - nextDay: '[' + t('tasks_enhanced', 'Tomorrow') + ']', + lastDay: '[' + t('tasks', 'Yesterday') + ']', + sameDay: '[' + t('tasks', 'Today') + ']', + nextDay: '[' + t('tasks', 'Tomorrow') + ']', lastWeek: 'DD.MM.YYYY', nextWeek: 'DD.MM.YYYY', sameElse: 'DD.MM.YYYY' @@ -120,9 +120,9 @@ }); moment.lang('details_short', { calendar: { - lastDay: '[' + t('tasks_enhanced', 'Yesterday') + ']', - sameDay: '[' + t('tasks_enhanced', 'Today') + ']', - nextDay: '[' + t('tasks_enhanced', 'Tomorrow') + ']', + lastDay: '[' + t('tasks', 'Yesterday') + ']', + sameDay: '[' + t('tasks', 'Today') + ']', + nextDay: '[' + t('tasks', 'Tomorrow') + ']', lastWeek: 'MMM DD, YYYY', nextWeek: 'MMM DD, YYYY', sameElse: 'MMM DD, YYYY' @@ -130,9 +130,9 @@ }); moment.lang('list_week', { calendar: { - lastDay: '[' + t('tasks_enhanced', 'Yesterday') + ']', - sameDay: '[' + t('tasks_enhanced', 'Today') + '], MMM. DD', - nextDay: '[' + t('tasks_enhanced', 'Tomorrow') + '], MMM. DD', + lastDay: '[' + t('tasks', 'Yesterday') + ']', + sameDay: '[' + t('tasks', 'Today') + '], MMM. DD', + nextDay: '[' + t('tasks', 'Tomorrow') + '], MMM. DD', lastWeek: 'ddd, MMM. DD', nextWeek: 'ddd, MMM. DD', sameElse: 'ddd, MMM. DD' @@ -140,19 +140,19 @@ }); return moment.lang('en', { relativeTime: { - future: t('tasks_enhanced', "in %s"), - past: t('tasks_enhanced', "%s ago"), - s: t('tasks_enhanced', "seconds"), - m: t('tasks_enhanced', "a minute"), - mm: t('tasks_enhanced', "%d minutes"), - h: t('tasks_enhanced', "an hour"), - hh: t('tasks_enhanced', "%d hours"), - d: t('tasks_enhanced', "a day"), - dd: t('tasks_enhanced', "%d days"), - M: t('tasks_enhanced', "a month"), - MM: t('tasks_enhanced', "%d months"), - y: t('tasks_enhanced', "a year"), - yy: t('tasks_enhanced', "%d years") + future: t('tasks', "in %s"), + past: t('tasks', "%s ago"), + s: t('tasks', "seconds"), + m: t('tasks', "a minute"), + mm: t('tasks', "%d minutes"), + h: t('tasks', "an hour"), + hh: t('tasks', "%d hours"), + d: t('tasks', "a day"), + dd: t('tasks', "%d days"), + M: t('tasks', "a month"), + MM: t('tasks', "%d months"), + y: t('tasks', "a year"), + yy: t('tasks', "%d years") } }); } @@ -337,8 +337,8 @@ }, myPosition: 'center top', atPosition: 'center bottom', - hourText: t('tasks_enhanced', 'Hours'), - minuteText: t('tasks_enhanced', 'Minutes') + hourText: t('tasks', 'Hours'), + minuteText: t('tasks', 'Minutes') }); } }; @@ -447,24 +447,24 @@ this._$scope.isAddingComment = false; this._$scope.durations = [ { - name: t('tasks_enhanced', 'week'), - names: t('tasks_enhanced', 'weeks'), + name: t('tasks', 'week'), + names: t('tasks', 'weeks'), id: 'week' }, { - name: t('tasks_enhanced', 'day'), - names: t('tasks_enhanced', 'days'), + name: t('tasks', 'day'), + names: t('tasks', 'days'), id: 'day' }, { - name: t('tasks_enhanced', 'hour'), - names: t('tasks_enhanced', 'hours'), + name: t('tasks', 'hour'), + names: t('tasks', 'hours'), id: 'hour' }, { - name: t('tasks_enhanced', 'minute'), - names: t('tasks_enhanced', 'minutes'), + name: t('tasks', 'minute'), + names: t('tasks', 'minutes'), id: 'minute' }, { - name: t('tasks_enhanced', 'second'), - names: t('tasks_enhanced', 'seconds'), + name: t('tasks', 'second'), + names: t('tasks', 'seconds'), id: 'second' } ]; @@ -472,22 +472,22 @@ var params; params = [ { - name: t('tasks_enhanced', 'before beginning'), + name: t('tasks', 'before beginning'), invert: true, related: 'START', id: "10" }, { - name: t('tasks_enhanced', 'after beginning'), + name: t('tasks', 'after beginning'), invert: false, related: 'START', id: "00" }, { - name: t('tasks_enhanced', 'before end'), + name: t('tasks', 'before end'), invert: true, related: 'END', id: "11" }, { - name: t('tasks_enhanced', 'after end'), + name: t('tasks', 'after end'), invert: false, related: 'END', id: "01" @@ -729,8 +729,8 @@ }; this._$scope.commentStrings = function() { return { - button: t('tasks_enhanced', 'Comment'), - input: t('tasks_enhanced', 'Add a comment') + button: t('tasks', 'Comment'), + input: t('tasks', 'Add a comment') }; }; } @@ -764,7 +764,7 @@ this._$scope.status.listNameBackup = ''; this._$scope.deleteList = function(listID) { var really; - really = confirm(t('tasks_enhanced', 'This will delete the Calendar "%s" and all of its entries.').replace('%s', _$listsmodel.getById(_$scope.route.listID).displayname)); + really = confirm(t('tasks', 'This will delete the Calendar "%s" and all of its entries.').replace('%s', _$listsmodel.getById(_$scope.route.listID).displayname)); if (really) { _$listsbusinesslayer.deleteList(listID); return $location.path('/lists/' + _$listsmodel.getStandardList()); @@ -807,10 +807,10 @@ }); return _$scope.status.newListName = ''; } else { - return alert(t('tasks_enhanced', 'The name "%s" is already used.').replace('%s', _$scope.status.newListName)); + return alert(t('tasks', 'The name "%s" is already used.').replace('%s', _$scope.status.newListName)); } } else { - return alert(t('tasks_enhanced', 'An empty name ist not allowed.')); + return alert(t('tasks', 'An empty name ist not allowed.')); } }; this._$scope.editName = function(listID) { @@ -838,10 +838,10 @@ _$listsbusinesslayer.setListName(_$scope.route.listID); return _$scope.endEditList(); } else { - return alert(t('tasks_enhanced', 'The name "%s" is already used.').replace('%s', name)); + return alert(t('tasks', 'The name "%s" is already used.').replace('%s', name)); } } else { - return alert(t('tasks_enhanced', 'An empty name ist not allowed.')); + return alert(t('tasks', 'An empty name ist not allowed.')); } }; this._$scope.endEditList = function() { @@ -960,37 +960,37 @@ this._$scope.collectionOptions = [ { id: 0, - name: t('tasks_enhanced', 'Hidden') + name: t('tasks', 'Hidden') }, { id: 1, - name: t('tasks_enhanced', 'Visible') + name: t('tasks', 'Visible') }, { id: 2, - name: t('tasks_enhanced', 'Automatic') + name: t('tasks', 'Automatic') } ]; this._$scope.startOfWeekOptions = [ { id: 0, - name: t('tasks_enhanced', 'Sunday') + name: t('tasks', 'Sunday') }, { id: 1, - name: t('tasks_enhanced', 'Monday') + name: t('tasks', 'Monday') }, { id: 2, - name: t('tasks_enhanced', 'Tuesday') + name: t('tasks', 'Tuesday') }, { id: 3, - name: t('tasks_enhanced', 'Wednesday') + name: t('tasks', 'Wednesday') }, { id: 4, - name: t('tasks_enhanced', 'Thursday') + name: t('tasks', 'Thursday') }, { id: 5, - name: t('tasks_enhanced', 'Friday') + name: t('tasks', 'Friday') }, { id: 6, - name: t('tasks_enhanced', 'Saturday') + name: t('tasks', 'Saturday') } ]; this._$scope.ok = function() { @@ -1042,19 +1042,19 @@ if (angular.isDefined(list = _$listsmodel.getById(_$listsmodel.getStandardList()))) { switch (_$scope.route.listID) { case 'starred': - return t('tasks_enhanced', 'Add an important item in "%s"...').replace('%s', list.displayname); + return t('tasks', 'Add an important item in "%s"...').replace('%s', list.displayname); case 'today': - return t('tasks_enhanced', 'Add an item due today in "%s"...').replace('%s', list.displayname); + return t('tasks', 'Add an item due today in "%s"...').replace('%s', list.displayname); case 'all': - return t('tasks_enhanced', 'Add an entry in "%s"...').replace('%s', list.displayname); + return t('tasks', 'Add an entry in "%s"...').replace('%s', list.displayname); case 'current': - return t('tasks_enhanced', 'Add a current entry in "%s"...').replace('%s', list.displayname); + return t('tasks', 'Add a current entry in "%s"...').replace('%s', list.displayname); case 'completed': case 'week': return null; default: if (angular.isDefined(_$listsmodel.getById(_$scope.route.listID))) { - return t('tasks_enhanced', 'Add an entry in "%s"...').replace('%s', _$listsmodel.getById(_$scope.route.listID).displayname); + return t('tasks', 'Add an entry in "%s"...').replace('%s', _$listsmodel.getById(_$scope.route.listID).displayname); } } } @@ -2350,7 +2350,7 @@ onSuccess: successCallbackWrapper, onFailure: failureCallbackWrapper }; - return this._request.get('/apps/tasks_enhanced/collections', params); + return this._request.get('/apps/tasks/collections', params); }; Persistence.prototype.getSettings = function(onSuccess, showLoading) { @@ -2379,7 +2379,7 @@ onSuccess: successCallbackWrapper, onFailure: failureCallbackWrapper }; - return this._request.get('/apps/tasks_enhanced/settings', params); + return this._request.get('/apps/tasks/settings', params); }; Persistence.prototype.setVisibility = function(collectionID, visibility) { @@ -2390,7 +2390,7 @@ visibility: visibility } }; - return this._request.post('/apps/tasks_enhanced/collection/\ + return this._request.post('/apps/tasks/collection/\ {collectionID}/visibility/{visibility}', params); }; @@ -2403,7 +2403,7 @@ value: +value } }; - return this._request.post('/apps/tasks_enhanced/settings/\ + return this._request.post('/apps/tasks/settings/\ {type}/{setting}/{value}', params); }; @@ -2439,7 +2439,7 @@ request: which } }; - return this._request.get('/apps/tasks_enhanced/lists', params); + return this._request.get('/apps/tasks/lists', params); }; Persistence.prototype.addList = function(list, onSuccess, onFailure) { @@ -2460,7 +2460,7 @@ onSuccess: onSuccess, onFailure: onFailure }; - return this._request.post('/apps/tasks_enhanced/lists/add', params); + return this._request.post('/apps/tasks/lists/add', params); }; Persistence.prototype.setListName = function(list) { @@ -2473,7 +2473,7 @@ name: list.displayname } }; - return this._request.post('/apps/tasks_enhanced/lists/{listID}/name', params); + return this._request.post('/apps/tasks/lists/{listID}/name', params); }; Persistence.prototype.deleteList = function(listID) { @@ -2483,7 +2483,7 @@ listID: listID } }; - return this._request.post('/apps/tasks_enhanced/lists/{listID}/delete', params); + return this._request.post('/apps/tasks/lists/{listID}/delete', params); }; Persistence.prototype.getTasks = function(onSuccess, showLoading) { @@ -2512,7 +2512,7 @@ onSuccess: successCallbackWrapper, onFailure: failureCallbackWrapper }; - return this._request.get('/apps/tasks_enhanced/tasks', params); + return this._request.get('/apps/tasks/tasks', params); }; Persistence.prototype.starTask = function(taskID) { @@ -2522,7 +2522,7 @@ taskID: taskID } }; - return this._request.post('/apps/tasks_enhanced/tasks/{taskID}/star', params); + return this._request.post('/apps/tasks/tasks/{taskID}/star', params); }; Persistence.prototype.unstarTask = function(taskID) { @@ -2532,7 +2532,7 @@ taskID: taskID } }; - return this._request.post('/apps/tasks_enhanced/tasks/{taskID}/unstar', params); + return this._request.post('/apps/tasks/tasks/{taskID}/unstar', params); }; Persistence.prototype.completeTask = function(taskID) { @@ -2542,7 +2542,7 @@ taskID: taskID } }; - return this._request.post('/apps/tasks_enhanced/tasks/{taskID}/complete', params); + return this._request.post('/apps/tasks/tasks/{taskID}/complete', params); }; Persistence.prototype.setPercentComplete = function(taskID, complete) { @@ -2555,7 +2555,7 @@ complete: complete } }; - return this._request.post('/apps/tasks_enhanced/tasks/{taskID}/percentcomplete', params); + return this._request.post('/apps/tasks/tasks/{taskID}/percentcomplete', params); }; Persistence.prototype.uncompleteTask = function(taskID) { @@ -2565,7 +2565,7 @@ taskID: taskID } }; - return this._request.post('/apps/tasks_enhanced/tasks/{taskID}/uncomplete', params); + return this._request.post('/apps/tasks/tasks/{taskID}/uncomplete', params); }; Persistence.prototype.addTask = function(task, onSuccess, onFailure) { @@ -2590,7 +2590,7 @@ onSuccess: onSuccess, onFailure: onFailure }; - return this._request.post('/apps/tasks_enhanced/tasks/add', params); + return this._request.post('/apps/tasks/tasks/add', params); }; Persistence.prototype.deleteTask = function(taskID) { @@ -2600,7 +2600,7 @@ taskID: taskID } }; - return this._request.post('/apps/tasks_enhanced/tasks/{taskID}/delete', params); + return this._request.post('/apps/tasks/tasks/{taskID}/delete', params); }; Persistence.prototype.setDueDate = function(taskID, due) { @@ -2613,7 +2613,7 @@ due: due } }; - return this._request.post('/apps/tasks_enhanced/tasks/{taskID}/due', params); + return this._request.post('/apps/tasks/tasks/{taskID}/due', params); }; Persistence.prototype.setStartDate = function(taskID, start) { @@ -2626,7 +2626,7 @@ start: start } }; - return this._request.post('/apps/tasks_enhanced/tasks/{taskID}/start', params); + return this._request.post('/apps/tasks/tasks/{taskID}/start', params); }; Persistence.prototype.setReminder = function(taskID, reminder) { @@ -2671,7 +2671,7 @@ } else { return; } - return this._request.post('/apps/tasks_enhanced/tasks/{taskID}/reminder', params); + return this._request.post('/apps/tasks/tasks/{taskID}/reminder', params); }; Persistence.prototype.changeCalendarId = function(taskID, calendarID) { @@ -2684,7 +2684,7 @@ calendarID: calendarID } }; - return this._request.post('/apps/tasks_enhanced/tasks/{taskID}/calendar', params); + return this._request.post('/apps/tasks/tasks/{taskID}/calendar', params); }; Persistence.prototype.setTaskName = function(taskID, name) { @@ -2697,7 +2697,7 @@ name: name } }; - return this._request.post('/apps/tasks_enhanced/tasks/{taskID}/name', params); + return this._request.post('/apps/tasks/tasks/{taskID}/name', params); }; Persistence.prototype.setTaskNote = function(taskID, note) { @@ -2710,7 +2710,7 @@ note: note } }; - return this._request.post('/apps/tasks_enhanced/tasks/{taskID}/note', params); + return this._request.post('/apps/tasks/tasks/{taskID}/note', params); }; Persistence.prototype.setShowHidden = function(showHidden) { @@ -2720,7 +2720,7 @@ showHidden: +showHidden } }; - return this._request.post('/apps/tasks_enhanced/settings/showhidden/{showHidden}', params); + return this._request.post('/apps/tasks/settings/showhidden/{showHidden}', params); }; Persistence.prototype.addComment = function(comment, onSuccess, onFailure) { @@ -2742,7 +2742,7 @@ onSuccess: onSuccess, onFailure: onFailure }; - return this._request.post('/apps/tasks_enhanced/tasks/{taskID}/comment', params); + return this._request.post('/apps/tasks/tasks/{taskID}/comment', params); }; Persistence.prototype.deleteComment = function(taskID, commentID) { @@ -2753,7 +2753,7 @@ commentID: commentID } }; - return this._request.post('/apps/tasks_enhanced/tasks/{taskID}/comment/\ + return this._request.post('/apps/tasks/tasks/{taskID}/comment/\ {commentID}/delete', params); }; @@ -2825,7 +2825,7 @@ if (moment(due, "YYYYMMDDTHHmmss").isValid()) { return moment(due, "YYYYMMDDTHHmmss").lang('details').calendar(); } else { - return t('tasks_enhanced', 'Set due date'); + return t('tasks', 'Set due date'); } }; }); @@ -2905,7 +2905,7 @@ (function() { angular.module('Tasks').filter('percentDetails', function() { return function(percent) { - return t('tasks_enhanced', '%s % completed').replace('%s', percent); + return t('tasks', '%s % completed').replace('%s', percent); }; }); @@ -2919,7 +2919,7 @@ if (reminder.type === 'DATE-TIME' && moment(reminder.date, "YYYYMMDDTHHmmss").isValid()) { return moment(reminder.date, "YYYYMMDDTHHmmss").lang('reminder').calendar(); } else if (reminder.type === 'DURATION' && reminder.duration) { - ds = t('tasks_enhanced', 'Remind me'); + ds = t('tasks', 'Remind me'); _ref = scope.durations; for (_i = 0, _len = _ref.length; _i < _len; _i++) { token = _ref[_i]; @@ -2935,31 +2935,31 @@ } if (!time) { if (reminder.duration.params.related === 'END') { - ds += ' ' + t('tasks_enhanced', 'at the end'); + ds += ' ' + t('tasks', 'at the end'); } else { - ds += ' ' + t('tasks_enhanced', 'at the beginning'); + ds += ' ' + t('tasks', 'at the beginning'); } } else { if (reminder.duration.params.invert) { if (reminder.duration.params.related === 'END') { - ds += ' ' + t('tasks_enhanced', 'before end'); + ds += ' ' + t('tasks', 'before end'); } else { - ds += ' ' + t('tasks_enhanced', 'before beginning'); + ds += ' ' + t('tasks', 'before beginning'); } } else { if (reminder.duration.params.related === 'END') { - ds += ' ' + t('tasks_enhanced', 'after end'); + ds += ' ' + t('tasks', 'after end'); } else { - ds += ' ' + t('tasks_enhanced', 'after beginning'); + ds += ' ' + t('tasks', 'after beginning'); } } } return ds; } else { - return t('tasks_enhanced', 'Remind me'); + return t('tasks', 'Remind me'); } } else { - return t('tasks_enhanced', 'Remind me'); + return t('tasks', 'Remind me'); } }; }); @@ -2972,7 +2972,7 @@ if (moment(due, "YYYYMMDDTHHmmss").isValid()) { return moment(due, "YYYYMMDDTHHmmss").lang('start').calendar(); } else { - return t('tasks_enhanced', 'Set start date'); + return t('tasks', 'Set start date'); } }; }); diff --git a/js/vendor/bootstrap/ui-bootstrap-custom-tpls-0.10.0.js b/js/vendor/bootstrap/ui-bootstrap-custom-tpls-0.10.0.js index f6dd8035..b10656aa 100644 --- a/js/vendor/bootstrap/ui-bootstrap-custom-tpls-0.10.0.js +++ b/js/vendor/bootstrap/ui-bootstrap-custom-tpls-0.10.0.js @@ -226,7 +226,7 @@ angular.module('ui.bootstrap.modal', ['ui.bootstrap.transition']) function removeModalWindow(modalInstance) { - var body = $document.find('#tasks_enhanced_wrapper').eq(0); + var body = $document.find('#tasks_wrapper').eq(0); var modalWindow = openedWindows.get(modalInstance).value; //clean up the stack @@ -304,7 +304,7 @@ angular.module('ui.bootstrap.modal', ['ui.bootstrap.transition']) keyboard: modal.keyboard }); - var body = $document.find('#tasks_enhanced_wrapper').eq(0), + var body = $document.find('#tasks_wrapper').eq(0), currBackdropIndex = backdropIndex(); if (currBackdropIndex >= 0 && !backdropDomEl) { diff --git a/js/vendor/bootstrap/ui-bootstrap-custom-tpls-0.10.0.min.js b/js/vendor/bootstrap/ui-bootstrap-custom-tpls-0.10.0.min.js index 6115f1ea..aeb70046 100644 --- a/js/vendor/bootstrap/ui-bootstrap-custom-tpls-0.10.0.min.js +++ b/js/vendor/bootstrap/ui-bootstrap-custom-tpls-0.10.0.min.js @@ -5,4 +5,4 @@ * Version: 0.10.0 - 2014-01-15 * License: MIT */ -angular.module("ui.bootstrap",["ui.bootstrap.tpls","ui.bootstrap.transition","ui.bootstrap.modal","ui.bootstrap.tabs"]),angular.module("ui.bootstrap.tpls",["template/modal/backdrop.html","template/modal/window.html","template/tabs/tab.html","template/tabs/tabset.html"]),angular.module("ui.bootstrap.transition",[]).factory("$transition",["$q","$timeout","$rootScope",function(a,b,c){function d(a){for(var b in a)if(void 0!==f.style[b])return a[b]}var e=function(d,f,g){g=g||{};var h=a.defer(),i=e[g.animation?"animationEndEventName":"transitionEndEventName"],j=function(){c.$apply(function(){d.unbind(i,j),h.resolve(d)})};return i&&d.bind(i,j),b(function(){angular.isString(f)?d.addClass(f):angular.isFunction(f)?f(d):angular.isObject(f)&&d.css(f),i||h.resolve(d)}),h.promise.cancel=function(){i&&d.unbind(i,j),h.reject("Transition cancelled")},h.promise},f=document.createElement("trans"),g={WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:"oTransitionEnd",transition:"transitionend"},h={WebkitTransition:"webkitAnimationEnd",MozTransition:"animationend",OTransition:"oAnimationEnd",transition:"animationend"};return e.transitionEndEventName=d(g),e.animationEndEventName=d(h),e}]),angular.module("ui.bootstrap.modal",["ui.bootstrap.transition"]).factory("$$stackedMap",function(){return{createNew:function(){var a=[];return{add:function(b,c){a.push({key:b,value:c})},get:function(b){for(var c=0;c<a.length;c++)if(b==a[c].key)return a[c]},keys:function(){for(var b=[],c=0;c<a.length;c++)b.push(a[c].key);return b},top:function(){return a[a.length-1]},remove:function(b){for(var c=-1,d=0;d<a.length;d++)if(b==a[d].key){c=d;break}return a.splice(c,1)[0]},removeTop:function(){return a.splice(a.length-1,1)[0]},length:function(){return a.length}}}}}).directive("modalBackdrop",["$timeout",function(a){return{restrict:"EA",replace:!0,templateUrl:"template/modal/backdrop.html",link:function(b){b.animate=!1,a(function(){b.animate=!0})}}}]).directive("modalWindow",["$modalStack","$timeout",function(a,b){return{restrict:"EA",scope:{index:"@",animate:"="},replace:!0,transclude:!0,templateUrl:"template/modal/window.html",link:function(c,d,e){c.windowClass=e.windowClass||"",b(function(){c.animate=!0,d[0].focus()}),c.close=function(b){var c=a.getTop();c&&c.value.backdrop&&"static"!=c.value.backdrop&&b.target===b.currentTarget&&(b.preventDefault(),b.stopPropagation(),a.dismiss(c.key,"backdrop click"))}}}}]).factory("$modalStack",["$transition","$timeout","$document","$compile","$rootScope","$$stackedMap",function(a,b,c,d,e,f){function g(){for(var a=-1,b=n.keys(),c=0;c<b.length;c++)n.get(b[c]).value.backdrop&&(a=c);return a}function h(a){var b=c.find("#tasks_enhanced_wrapper").eq(0),d=n.get(a).value;n.remove(a),j(d.modalDomEl,d.modalScope,300,i),b.toggleClass(m,n.length()>0)}function i(){if(k&&-1==g()){var a=l;j(k,l,150,function(){a.$destroy(),a=null}),k=void 0,l=void 0}}function j(c,d,e,f){function g(){g.done||(g.done=!0,c.remove(),f&&f())}d.animate=!1;var h=a.transitionEndEventName;if(h){var i=b(g,e);c.bind(h,function(){b.cancel(i),g(),d.$apply()})}else b(g,0)}var k,l,m="modal-open",n=f.createNew(),o={};return e.$watch(g,function(a){l&&(l.index=a)}),c.bind("keydown",function(a){var b;27===a.which&&(b=n.top(),b&&b.value.keyboard&&e.$apply(function(){o.dismiss(b.key)}))}),o.open=function(a,b){n.add(a,{deferred:b.deferred,modalScope:b.scope,backdrop:b.backdrop,keyboard:b.keyboard});var f=c.find("#tasks_enhanced_wrapper").eq(0),h=g();h>=0&&!k&&(l=e.$new(!0),l.index=h,k=d("<div modal-backdrop></div>")(l),f.append(k));var i=angular.element("<div modal-window></div>");i.attr("window-class",b.windowClass),i.attr("index",n.length()-1),i.attr("animate","animate"),i.html(b.content);var j=d(i)(b.scope);n.top().value.modalDomEl=j,f.append(j),f.addClass(m)},o.close=function(a,b){var c=n.get(a).value;c&&(c.deferred.resolve(b),h(a))},o.dismiss=function(a,b){var c=n.get(a).value;c&&(c.deferred.reject(b),h(a))},o.dismissAll=function(a){for(var b=this.getTop();b;)this.dismiss(b.key,a),b=this.getTop()},o.getTop=function(){return n.top()},o}]).provider("$modal",function(){var a={options:{backdrop:!0,keyboard:!0},$get:["$injector","$rootScope","$q","$http","$templateCache","$controller","$modalStack",function(b,c,d,e,f,g,h){function i(a){return a.template?d.when(a.template):e.get(a.templateUrl,{cache:f}).then(function(a){return a.data})}function j(a){var c=[];return angular.forEach(a,function(a){(angular.isFunction(a)||angular.isArray(a))&&c.push(d.when(b.invoke(a)))}),c}var k={};return k.open=function(b){var e=d.defer(),f=d.defer(),k={result:e.promise,opened:f.promise,close:function(a){h.close(k,a)},dismiss:function(a){h.dismiss(k,a)}};if(b=angular.extend({},a.options,b),b.resolve=b.resolve||{},!b.template&&!b.templateUrl)throw new Error("One of template or templateUrl options is required.");var l=d.all([i(b)].concat(j(b.resolve)));return l.then(function(a){var d=(b.scope||c).$new();d.$close=k.close,d.$dismiss=k.dismiss;var f,i={},j=1;b.controller&&(i.$scope=d,i.$modalInstance=k,angular.forEach(b.resolve,function(b,c){i[c]=a[j++]}),f=g(b.controller,i)),h.open(k,{scope:d,deferred:e,content:a[0],backdrop:b.backdrop,keyboard:b.keyboard,windowClass:b.windowClass})},function(a){e.reject(a)}),l.then(function(){f.resolve(!0)},function(){f.reject(!1)}),k},k}]};return a}),angular.module("ui.bootstrap.tabs",[]).controller("TabsetController",["$scope",function(a){var b=this,c=b.tabs=a.tabs=[];b.select=function(a){angular.forEach(c,function(a){a.active=!1}),a.active=!0},b.addTab=function(a){c.push(a),(1===c.length||a.active)&&b.select(a)},b.removeTab=function(a){var d=c.indexOf(a);if(a.active&&c.length>1){var e=d==c.length-1?d-1:d+1;b.select(c[e])}c.splice(d,1)}}]).directive("tabset",function(){return{restrict:"EA",transclude:!0,replace:!0,scope:{},controller:"TabsetController",templateUrl:"template/tabs/tabset.html",link:function(a,b,c){a.vertical=angular.isDefined(c.vertical)?a.$parent.$eval(c.vertical):!1,a.justified=angular.isDefined(c.justified)?a.$parent.$eval(c.justified):!1,a.type=angular.isDefined(c.type)?a.$parent.$eval(c.type):"tabs"}}}).directive("tab",["$parse",function(a){return{require:"^tabset",restrict:"EA",replace:!0,templateUrl:"template/tabs/tab.html",transclude:!0,scope:{heading:"@",onSelect:"&select",onDeselect:"&deselect"},controller:function(){},compile:function(b,c,d){return function(b,c,e,f){var g,h;e.active?(g=a(e.active),h=g.assign,b.$parent.$watch(g,function(a,c){a!==c&&(b.active=!!a)}),b.active=g(b.$parent)):h=g=angular.noop,b.$watch("active",function(a){h(b.$parent,a),a?(f.select(b),b.onSelect()):b.onDeselect()}),b.disabled=!1,e.disabled&&b.$parent.$watch(a(e.disabled),function(a){b.disabled=!!a}),b.select=function(){b.disabled||(b.active=!0)},f.addTab(b),b.$on("$destroy",function(){f.removeTab(b)}),b.$transcludeFn=d}}}}]).directive("tabHeadingTransclude",[function(){return{restrict:"A",require:"^tab",link:function(a,b){a.$watch("headingElement",function(a){a&&(b.html(""),b.append(a))})}}}]).directive("tabContentTransclude",function(){function a(a){return a.tagName&&(a.hasAttribute("tab-heading")||a.hasAttribute("data-tab-heading")||"tab-heading"===a.tagName.toLowerCase()||"data-tab-heading"===a.tagName.toLowerCase())}return{restrict:"A",require:"^tabset",link:function(b,c,d){var e=b.$eval(d.tabContentTransclude);e.$transcludeFn(e.$parent,function(b){angular.forEach(b,function(b){a(b)?e.headingElement=b:c.append(b)})})}}}),angular.module("template/modal/backdrop.html",[]).run(["$templateCache",function(a){a.put("template/modal/backdrop.html",'<div class="modal-backdrop fade" ng-class="{in: animate}" ng-style="{\'z-index\': 90 + index*10}"></div>')}]),angular.module("template/modal/window.html",[]).run(["$templateCache",function(a){a.put("template/modal/window.html",'<div tabindex="-1" class="modal fade {{ windowClass }}" ng-class="{in: animate}" ng-style="{\'z-index\': 100 + index*10, display: \'block\'}" ng-click="close($event)">\n <div class="modal-dialog"><div class="modal-content" ng-transclude></div></div>\n</div>')}]),angular.module("template/tabs/pane.html",[]).run(["$templateCache",function(a){a.put("template/tabs/pane.html",'<div class="tab-pane" ng-class="{active: selected}" ng-show="selected" ng-transclude></div>\n')}]),angular.module("template/tabs/tab.html",[]).run(["$templateCache",function(a){a.put("template/tabs/tab.html",'<li ng-class="{active: active, disabled: disabled}">\n <a ng-click="select()" tab-heading-transclude>{{heading}}</a>\n</li>\n')}]),angular.module("template/tabs/tabs.html",[]).run(["$templateCache",function(a){a.put("template/tabs/tabs.html",'<div class="tabbable">\n <ul class="nav nav-tabs">\n <li ng-repeat="pane in panes" ng-class="{active:pane.selected}">\n <a ng-click="select(pane)">{{pane.heading}}</a>\n </li>\n </ul>\n <div class="tab-content" ng-transclude></div>\n</div>\n')}]),angular.module("template/tabs/tabset-titles.html",[]).run(["$templateCache",function(a){a.put("template/tabs/tabset-titles.html","<ul class=\"nav {{type && 'nav-' + type}}\" ng-class=\"{'nav-stacked': vertical}\">\n</ul>\n")}]),angular.module("template/tabs/tabset.html",[]).run(["$templateCache",function(a){a.put("template/tabs/tabset.html",'\n<div class="tabbable">\n <ul class="nav {{type && \'nav-\' + type}}" ng-class="{\'nav-stacked\': vertical, \'nav-justified\': justified}" ng-transclude></ul>\n <div class="tab-content">\n <div class="tab-pane" \n ng-repeat="tab in tabs" \n ng-class="{active: tab.active}"\n tab-content-transclude="tab">\n </div>\n </div>\n</div>\n')}]);
\ No newline at end of file +angular.module("ui.bootstrap",["ui.bootstrap.tpls","ui.bootstrap.transition","ui.bootstrap.modal","ui.bootstrap.tabs"]),angular.module("ui.bootstrap.tpls",["template/modal/backdrop.html","template/modal/window.html","template/tabs/tab.html","template/tabs/tabset.html"]),angular.module("ui.bootstrap.transition",[]).factory("$transition",["$q","$timeout","$rootScope",function(a,b,c){function d(a){for(var b in a)if(void 0!==f.style[b])return a[b]}var e=function(d,f,g){g=g||{};var h=a.defer(),i=e[g.animation?"animationEndEventName":"transitionEndEventName"],j=function(){c.$apply(function(){d.unbind(i,j),h.resolve(d)})};return i&&d.bind(i,j),b(function(){angular.isString(f)?d.addClass(f):angular.isFunction(f)?f(d):angular.isObject(f)&&d.css(f),i||h.resolve(d)}),h.promise.cancel=function(){i&&d.unbind(i,j),h.reject("Transition cancelled")},h.promise},f=document.createElement("trans"),g={WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:"oTransitionEnd",transition:"transitionend"},h={WebkitTransition:"webkitAnimationEnd",MozTransition:"animationend",OTransition:"oAnimationEnd",transition:"animationend"};return e.transitionEndEventName=d(g),e.animationEndEventName=d(h),e}]),angular.module("ui.bootstrap.modal",["ui.bootstrap.transition"]).factory("$$stackedMap",function(){return{createNew:function(){var a=[];return{add:function(b,c){a.push({key:b,value:c})},get:function(b){for(var c=0;c<a.length;c++)if(b==a[c].key)return a[c]},keys:function(){for(var b=[],c=0;c<a.length;c++)b.push(a[c].key);return b},top:function(){return a[a.length-1]},remove:function(b){for(var c=-1,d=0;d<a.length;d++)if(b==a[d].key){c=d;break}return a.splice(c,1)[0]},removeTop:function(){return a.splice(a.length-1,1)[0]},length:function(){return a.length}}}}}).directive("modalBackdrop",["$timeout",function(a){return{restrict:"EA",replace:!0,templateUrl:"template/modal/backdrop.html",link:function(b){b.animate=!1,a(function(){b.animate=!0})}}}]).directive("modalWindow",["$modalStack","$timeout",function(a,b){return{restrict:"EA",scope:{index:"@",animate:"="},replace:!0,transclude:!0,templateUrl:"template/modal/window.html",link:function(c,d,e){c.windowClass=e.windowClass||"",b(function(){c.animate=!0,d[0].focus()}),c.close=function(b){var c=a.getTop();c&&c.value.backdrop&&"static"!=c.value.backdrop&&b.target===b.currentTarget&&(b.preventDefault(),b.stopPropagation(),a.dismiss(c.key,"backdrop click"))}}}}]).factory("$modalStack",["$transition","$timeout","$document","$compile","$rootScope","$$stackedMap",function(a,b,c,d,e,f){function g(){for(var a=-1,b=n.keys(),c=0;c<b.length;c++)n.get(b[c]).value.backdrop&&(a=c);return a}function h(a){var b=c.find("#tasks_wrapper").eq(0),d=n.get(a).value;n.remove(a),j(d.modalDomEl,d.modalScope,300,i),b.toggleClass(m,n.length()>0)}function i(){if(k&&-1==g()){var a=l;j(k,l,150,function(){a.$destroy(),a=null}),k=void 0,l=void 0}}function j(c,d,e,f){function g(){g.done||(g.done=!0,c.remove(),f&&f())}d.animate=!1;var h=a.transitionEndEventName;if(h){var i=b(g,e);c.bind(h,function(){b.cancel(i),g(),d.$apply()})}else b(g,0)}var k,l,m="modal-open",n=f.createNew(),o={};return e.$watch(g,function(a){l&&(l.index=a)}),c.bind("keydown",function(a){var b;27===a.which&&(b=n.top(),b&&b.value.keyboard&&e.$apply(function(){o.dismiss(b.key)}))}),o.open=function(a,b){n.add(a,{deferred:b.deferred,modalScope:b.scope,backdrop:b.backdrop,keyboard:b.keyboard});var f=c.find("#tasks_wrapper").eq(0),h=g();h>=0&&!k&&(l=e.$new(!0),l.index=h,k=d("<div modal-backdrop></div>")(l),f.append(k));var i=angular.element("<div modal-window></div>");i.attr("window-class",b.windowClass),i.attr("index",n.length()-1),i.attr("animate","animate"),i.html(b.content);var j=d(i)(b.scope);n.top().value.modalDomEl=j,f.append(j),f.addClass(m)},o.close=function(a,b){var c=n.get(a).value;c&&(c.deferred.resolve(b),h(a))},o.dismiss=function(a,b){var c=n.get(a).value;c&&(c.deferred.reject(b),h(a))},o.dismissAll=function(a){for(var b=this.getTop();b;)this.dismiss(b.key,a),b=this.getTop()},o.getTop=function(){return n.top()},o}]).provider("$modal",function(){var a={options:{backdrop:!0,keyboard:!0},$get:["$injector","$rootScope","$q","$http","$templateCache","$controller","$modalStack",function(b,c,d,e,f,g,h){function i(a){return a.template?d.when(a.template):e.get(a.templateUrl,{cache:f}).then(function(a){return a.data})}function j(a){var c=[];return angular.forEach(a,function(a){(angular.isFunction(a)||angular.isArray(a))&&c.push(d.when(b.invoke(a)))}),c}var k={};return k.open=function(b){var e=d.defer(),f=d.defer(),k={result:e.promise,opened:f.promise,close:function(a){h.close(k,a)},dismiss:function(a){h.dismiss(k,a)}};if(b=angular.extend({},a.options,b),b.resolve=b.resolve||{},!b.template&&!b.templateUrl)throw new Error("One of template or templateUrl options is required.");var l=d.all([i(b)].concat(j(b.resolve)));return l.then(function(a){var d=(b.scope||c).$new();d.$close=k.close,d.$dismiss=k.dismiss;var f,i={},j=1;b.controller&&(i.$scope=d,i.$modalInstance=k,angular.forEach(b.resolve,function(b,c){i[c]=a[j++]}),f=g(b.controller,i)),h.open(k,{scope:d,deferred:e,content:a[0],backdrop:b.backdrop,keyboard:b.keyboard,windowClass:b.windowClass})},function(a){e.reject(a)}),l.then(function(){f.resolve(!0)},function(){f.reject(!1)}),k},k}]};return a}),angular.module("ui.bootstrap.tabs",[]).controller("TabsetController",["$scope",function(a){var b=this,c=b.tabs=a.tabs=[];b.select=function(a){angular.forEach(c,function(a){a.active=!1}),a.active=!0},b.addTab=function(a){c.push(a),(1===c.length||a.active)&&b.select(a)},b.removeTab=function(a){var d=c.indexOf(a);if(a.active&&c.length>1){var e=d==c.length-1?d-1:d+1;b.select(c[e])}c.splice(d,1)}}]).directive("tabset",function(){return{restrict:"EA",transclude:!0,replace:!0,scope:{},controller:"TabsetController",templateUrl:"template/tabs/tabset.html",link:function(a,b,c){a.vertical=angular.isDefined(c.vertical)?a.$parent.$eval(c.vertical):!1,a.justified=angular.isDefined(c.justified)?a.$parent.$eval(c.justified):!1,a.type=angular.isDefined(c.type)?a.$parent.$eval(c.type):"tabs"}}}).directive("tab",["$parse",function(a){return{require:"^tabset",restrict:"EA",replace:!0,templateUrl:"template/tabs/tab.html",transclude:!0,scope:{heading:"@",onSelect:"&select",onDeselect:"&deselect"},controller:function(){},compile:function(b,c,d){return function(b,c,e,f){var g,h;e.active?(g=a(e.active),h=g.assign,b.$parent.$watch(g,function(a,c){a!==c&&(b.active=!!a)}),b.active=g(b.$parent)):h=g=angular.noop,b.$watch("active",function(a){h(b.$parent,a),a?(f.select(b),b.onSelect()):b.onDeselect()}),b.disabled=!1,e.disabled&&b.$parent.$watch(a(e.disabled),function(a){b.disabled=!!a}),b.select=function(){b.disabled||(b.active=!0)},f.addTab(b),b.$on("$destroy",function(){f.removeTab(b)}),b.$transcludeFn=d}}}}]).directive("tabHeadingTransclude",[function(){return{restrict:"A",require:"^tab",link:function(a,b){a.$watch("headingElement",function(a){a&&(b.html(""),b.append(a))})}}}]).directive("tabContentTransclude",function(){function a(a){return a.tagName&&(a.hasAttribute("tab-heading")||a.hasAttribute("data-tab-heading")||"tab-heading"===a.tagName.toLowerCase()||"data-tab-heading"===a.tagName.toLowerCase())}return{restrict:"A",require:"^tabset",link:function(b,c,d){var e=b.$eval(d.tabContentTransclude);e.$transcludeFn(e.$parent,function(b){angular.forEach(b,function(b){a(b)?e.headingElement=b:c.append(b)})})}}}),angular.module("template/modal/backdrop.html",[]).run(["$templateCache",function(a){a.put("template/modal/backdrop.html",'<div class="modal-backdrop fade" ng-class="{in: animate}" ng-style="{\'z-index\': 90 + index*10}"></div>')}]),angular.module("template/modal/window.html",[]).run(["$templateCache",function(a){a.put("template/modal/window.html",'<div tabindex="-1" class="modal fade {{ windowClass }}" ng-class="{in: animate}" ng-style="{\'z-index\': 100 + index*10, display: \'block\'}" ng-click="close($event)">\n <div class="modal-dialog"><div class="modal-content" ng-transclude></div></div>\n</div>')}]),angular.module("template/tabs/pane.html",[]).run(["$templateCache",function(a){a.put("template/tabs/pane.html",'<div class="tab-pane" ng-class="{active: selected}" ng-show="selected" ng-transclude></div>\n')}]),angular.module("template/tabs/tab.html",[]).run(["$templateCache",function(a){a.put("template/tabs/tab.html",'<li ng-class="{active: active, disabled: disabled}">\n <a ng-click="select()" tab-heading-transclude>{{heading}}</a>\n</li>\n')}]),angular.module("template/tabs/tabs.html",[]).run(["$templateCache",function(a){a.put("template/tabs/tabs.html",'<div class="tabbable">\n <ul class="nav nav-tabs">\n <li ng-repeat="pane in panes" ng-class="{active:pane.selected}">\n <a ng-click="select(pane)">{{pane.heading}}</a>\n </li>\n </ul>\n <div class="tab-content" ng-transclude></div>\n</div>\n')}]),angular.module("template/tabs/tabset-titles.html",[]).run(["$templateCache",function(a){a.put("template/tabs/tabset-titles.html","<ul class=\"nav {{type && 'nav-' + type}}\" ng-class=\"{'nav-stacked': vertical}\">\n</ul>\n")}]),angular.module("template/tabs/tabset.html",[]).run(["$templateCache",function(a){a.put("template/tabs/tabset.html",'\n<div class="tabbable">\n <ul class="nav {{type && \'nav-\' + type}}" ng-class="{\'nav-stacked\': vertical, \'nav-justified\': justified}" ng-transclude></ul>\n <div class="tab-content">\n <div class="tab-pane" \n ng-repeat="tab in tabs" \n ng-class="{active: tab.active}"\n tab-content-transclude="tab">\n </div>\n </div>\n</div>\n')}]);
\ No newline at end of file diff --git a/lib/controller.php b/lib/controller.php index 27d62b9e..067d61dc 100644 --- a/lib/controller.php +++ b/lib/controller.php @@ -9,7 +9,7 @@ * See the COPYING-README file. */ -namespace OCA\Tasks_enhanced; +namespace OCA\Tasks; use OCP\AppFramework\IAppContainer, OCP\AppFramework\Controller as BaseController, diff --git a/lib/controller/collectionscontroller.php b/lib/controller/collectionscontroller.php index 9eeb0608..984cb5bb 100644 --- a/lib/controller/collectionscontroller.php +++ b/lib/controller/collectionscontroller.php @@ -21,9 +21,9 @@ * */ -namespace OCA\Tasks_enhanced\Controller; +namespace OCA\Tasks\Controller; -use OCA\Tasks_enhanced\Controller, +use OCA\Tasks\Controller, OCP\AppFramework\Http\JSONResponse; class CollectionsController extends Controller { @@ -32,7 +32,7 @@ class CollectionsController extends Controller { * @NoAdminRequired */ public function getCollections(){ - $l = \OCP\Util::getL10N('tasks_enhanced'); + $l = \OCP\Util::getL10N('tasks'); $collections = array( array( 'id' => "starred", @@ -61,14 +61,14 @@ class CollectionsController extends Controller { ); foreach ($collections as $key => $collection){ try{ - $tmp = \OCP\Config::getUserValue($this->api->getUserId(), 'tasks_enhanced','show_'.$collection['id']); + $tmp = \OCP\Config::getUserValue($this->api->getUserId(), 'tasks','show_'.$collection['id']); if (!in_array((int)$tmp, array(0,1,2)) || $tmp === null) { $tmp = 2; - \OCP\Config::setUserValue($this->api->getUserId(), 'tasks_enhanced','show_'.$collection['id'],$tmp); + \OCP\Config::setUserValue($this->api->getUserId(), 'tasks','show_'.$collection['id'],$tmp); } $collections[$key]['show'] = (int)$tmp; }catch(\Exception $e) { - \OCP\Util::writeLog('tasks_enhanced', $e->getMessage(), \OCP\Util::ERROR); + \OCP\Util::writeLog('tasks', $e->getMessage(), \OCP\Util::ERROR); } } $result = array( @@ -88,7 +88,7 @@ class CollectionsController extends Controller { $collectionId = (string) $this->params('collectionID'); $vis = (int) $this->params('visibility'); if (in_array($vis, array(0,1,2))){ - \OCP\Config::setUserValue($this->api->getUserId(), 'tasks_enhanced','show_'.$collectionId,$vis); + \OCP\Config::setUserValue($this->api->getUserId(), 'tasks','show_'.$collectionId,$vis); } $response = new JSONResponse(); return $response; diff --git a/lib/controller/listscontroller.php b/lib/controller/listscontroller.php index cfe12e49..870171ae 100644 --- a/lib/controller/listscontroller.php +++ b/lib/controller/listscontroller.php @@ -21,9 +21,9 @@ * */ -namespace OCA\Tasks_enhanced\Controller; +namespace OCA\Tasks\Controller; -use OCA\Tasks_enhanced\Controller, +use OCA\Tasks\Controller, OCP\AppFramework\Http\JSONResponse; class ListsController extends Controller { diff --git a/lib/controller/pagecontroller.php b/lib/controller/pagecontroller.php index 294316cd..54419304 100644 --- a/lib/controller/pagecontroller.php +++ b/lib/controller/pagecontroller.php @@ -8,9 +8,9 @@ * See the COPYING-README file. */ -namespace OCA\Tasks_enhanced\Controller; +namespace OCA\Tasks\Controller; -use OCA\Tasks_enhanced\Controller, +use OCA\Tasks\Controller, OCP\AppFramework\Http\TemplateResponse; @@ -25,30 +25,30 @@ class PageController extends Controller { */ public function index() { if (defined('DEBUG') && DEBUG) { - \OCP\Util::addScript('tasks_enhanced', 'vendor/angularjs/angular'); - \OCP\Util::addScript('tasks_enhanced', 'vendor/angularjs/angular-route'); - \OCP\Util::addScript('tasks_enhanced', 'vendor/angularjs/angular-animate'); - \OCP\Util::addScript('tasks_enhanced', 'vendor/momentjs/moment'); - \OCP\Util::addScript('tasks_enhanced', 'vendor/bootstrap/ui-bootstrap-custom-tpls-0.10.0'); + \OCP\Util::addScript('tasks', 'vendor/angularjs/angular'); + \OCP\Util::addScript('tasks', 'vendor/angularjs/angular-route'); + \OCP\Util::addScript('tasks', 'vendor/angularjs/angular-animate'); + \OCP\Util::addScript('tasks', 'vendor/momentjs/moment'); + \OCP\Util::addScript('tasks', 'vendor/bootstrap/ui-bootstrap-custom-tpls-0.10.0'); } else { - \OCP\Util::addScript('tasks_enhanced', 'vendor/angularjs/angular.min'); - \OCP\Util::addScript('tasks_enhanced', 'vendor/angularjs/angular-route.min'); - \OCP\Util::addScript('tasks_enhanced', 'vendor/angularjs/angular-animate.min'); - \OCP\Util::addScript('tasks_enhanced', 'vendor/momentjs/moment.min'); - \OCP\Util::addScript('tasks_enhanced', 'vendor/bootstrap/ui-bootstrap-custom-tpls-0.10.0.min'); + \OCP\Util::addScript('tasks', 'vendor/angularjs/angular.min'); + \OCP\Util::addScript('tasks', 'vendor/angularjs/angular-route.min'); + \OCP\Util::addScript('tasks', 'vendor/angularjs/angular-animate.min'); + \OCP\Util::addScript('tasks', 'vendor/momentjs/moment.min'); + \OCP\Util::addScript('tasks', 'vendor/bootstrap/ui-bootstrap-custom-tpls-0.10.0.min'); } - \OCP\Util::addScript('tasks_enhanced', 'public/app'); - \OCP\Util::addScript('tasks_enhanced', 'vendor/appframework/app'); - \OCP\Util::addScript('tasks_enhanced', 'vendor/timepicker/jquery.ui.timepicker'); - \OCP\Util::addStyle('tasks_enhanced', 'style'); - \OCP\Util::addStyle('tasks_enhanced', 'vendor/bootstrap/bootstrap'); + \OCP\Util::addScript('tasks', 'public/app'); + \OCP\Util::addScript('tasks', 'vendor/appframework/app'); + \OCP\Util::addScript('tasks', 'vendor/timepicker/jquery.ui.timepicker'); + \OCP\Util::addStyle('tasks', 'style'); + \OCP\Util::addStyle('tasks', 'vendor/bootstrap/bootstrap'); $date = new \DateTimeZone(\OC_Calendar_App::getTimezone()); $day = new \DateTime('today', $date); $day = $day->format('d'); // TODO: Make a HTMLTemplateResponse class - $response = new TemplateResponse('tasks_enhanced', 'main'); + $response = new TemplateResponse('tasks', 'main'); $response->setParams(array( 'DOM' => $day )); diff --git a/lib/controller/settingscontroller.php b/lib/controller/settingscontroller.php index d02d0e2a..9a002ff4 100644 --- a/lib/controller/settingscontroller.php +++ b/lib/controller/settingscontroller.php @@ -21,9 +21,9 @@ * */ -namespace OCA\Tasks_enhanced\Controller; +namespace OCA\Tasks\Controller; -use OCA\Tasks_enhanced\Controller, +use OCA\Tasks\Controller, OCP\AppFramework\Http\JSONResponse; class SettingsController extends Controller { @@ -35,8 +35,8 @@ class SettingsController extends Controller { $settings = array( array( 'id' => 'various', - 'showHidden' => (int)\OCP\Config::getUserValue($this->api->getUserId(), 'tasks_enhanced','various_showHidden'), - 'startOfWeek' => (int)\OCP\Config::getUserValue($this->api->getUserId(), 'tasks_enhanced','various_startOfWeek'), + 'showHidden' => (int)\OCP\Config::getUserValue($this->api->getUserId(), 'tasks','various_showHidden'), + 'startOfWeek' => (int)\OCP\Config::getUserValue($this->api->getUserId(), 'tasks','various_startOfWeek'), 'userID' => $this->api->getUserId() ) @@ -55,7 +55,7 @@ class SettingsController extends Controller { * @NoAdminRequired */ public function set(){ - \OCP\Config::setUserValue($this->api->getUserId(), 'tasks_enhanced',$this->params('type').'_'.$this->params('setting'), $this->params('value')); + \OCP\Config::setUserValue($this->api->getUserId(), 'tasks',$this->params('type').'_'.$this->params('setting'), $this->params('value')); $response = new JSONResponse(); $response->setData(); return $response; diff --git a/lib/controller/taskscontroller.php b/lib/controller/taskscontroller.php index e18f7811..2f9673ab 100644 --- a/lib/controller/taskscontroller.php +++ b/lib/controller/taskscontroller.php @@ -21,10 +21,10 @@ * */ -namespace OCA\Tasks_enhanced\Controller; +namespace OCA\Tasks\Controller; -use OCA\Tasks_enhanced\Controller, - OCA\Tasks_enhanced\Helper, +use OCA\Tasks\Controller, + OCA\Tasks\Helper, OCP\AppFramework\Http\JSONResponse; class TasksController extends Controller { @@ -54,7 +54,7 @@ class TasksController extends Controller { $task_data['calendarcolor'] = $calendar['calendarcolor']; $tasks[] = $task_data; } catch(\Exception $e) { - \OCP\Util::writeLog('tasks_enhanced', $e->getMessage(), \OCP\Util::ERROR); + \OCP\Util::writeLog('tasks', $e->getMessage(), \OCP\Util::ERROR); } } } diff --git a/lib/dispatcher.php b/lib/dispatcher.php index 545cf865..d2c4cdfe 100644 --- a/lib/dispatcher.php +++ b/lib/dispatcher.php @@ -8,15 +8,15 @@ * See the COPYING-README file. */ -namespace OCA\Tasks_enhanced; +namespace OCA\Tasks; use OCP\AppFramework\App as MainApp, OCP\AppFramework\IAppContainer, - OCA\Tasks_enhanced\Controller\PageController, - OCA\Tasks_enhanced\Controller\CollectionsController, - OCA\Tasks_enhanced\Controller\ListsController, - OCA\Tasks_enhanced\Controller\TasksController, - OCA\Tasks_enhanced\Controller\SettingsController; + OCA\Tasks\Controller\PageController, + OCA\Tasks\Controller\CollectionsController, + OCA\Tasks\Controller\ListsController, + OCA\Tasks\Controller\TasksController, + OCA\Tasks\Controller\SettingsController; /** * This class manages our app actions @@ -31,7 +31,7 @@ class Dispatcher extends MainApp { protected $app; public function __construct($params) { - parent::__construct('tasks_enhanced', $params); + parent::__construct('tasks', $params); $this->container = $this->getContainer(); $this->registerServices(); } diff --git a/lib/helper.php b/lib/helper.php index c3b43cef..c7a721fd 100644 --- a/lib/helper.php +++ b/lib/helper.php @@ -20,10 +20,10 @@ * */ -namespace OCA\Tasks_enhanced; +namespace OCA\Tasks; use Sabre\VObject; -// use OCA\Tasks_enhanced\App; +// use OCA\Tasks\App; Class helper { @@ -48,7 +48,7 @@ Class helper { $task['start'] = $start->format('Ymd\THis'); } catch(\Exception $e) { $task['start'] = null; - \OCP\Util::writeLog('tasks_enhanced', $e->getMessage(), \OCP\Util::ERROR); + \OCP\Util::writeLog('tasks', $e->getMessage(), \OCP\Util::ERROR); } } else { $task['start'] = null; @@ -61,7 +61,7 @@ Class helper { $task['due'] = $due->format('Ymd\THis'); } catch(\Exception $e) { $task['due'] = null; - \OCP\Util::writeLog('tasks_enhanced', $e->getMessage(), \OCP\Util::ERROR); + \OCP\Util::writeLog('tasks', $e->getMessage(), \OCP\Util::ERROR); } } else { $task['due'] = null; @@ -143,7 +143,7 @@ Class helper { } catch(\Exception $e) { $task['reminder'] = null; - \OCP\Util::writeLog('tasks_enhanced', $e->getMessage(), \OCP\Util::ERROR); + \OCP\Util::writeLog('tasks', $e->getMessage(), \OCP\Util::ERROR); } } else { $task['reminder'] = null; @@ -163,7 +163,7 @@ Class helper { $task['completed'] = true; } catch(\Exception $e) { $task['completed'] = false; - \OCP\Util::writeLog('tasks_enhanced', $e->getMessage(), \OCP\Util::ERROR); + \OCP\Util::writeLog('tasks', $e->getMessage(), \OCP\Util::ERROR); } } else { $task['completed'] = false; diff --git a/templates/main.php b/templates/main.php index 6dc2cae5..78569236 100644 --- a/templates/main.php +++ b/templates/main.php @@ -1,4 +1,4 @@ -<div ng-app="Tasks" ng-cloak ng-controller="AppController" ng-click="closeAll()" id="tasks_enhanced_wrapper"> +<div ng-app="Tasks" ng-cloak ng-controller="AppController" ng-click="closeAll()" id="tasks_wrapper"> <div id="app-navigation" ng-controller="ListController"> <div id="task_lists_header" class="header" ng-class="{'search': status.searchActive}" ng-controller="SearchController"> <div id="main-toolbar"> |