diff options
| author | Raimund Schlüßler <raimund.schluessler@googlemail.com> | 2016-08-07 01:23:15 +0300 |
|---|---|---|
| committer | Raimund Schlüßler <raimund.schluessler@googlemail.com> | 2016-08-07 12:40:08 +0300 |
| commit | 400d0af4b76c63238a8e052dfa4efa9f47fdd6e1 (patch) | |
| tree | 891ba3ebd2ddbd5839d5bb5ca2e1c06638898db7 /templates | |
| parent | 0ff41bc7e91208d686edf328b35528e1b97f90ad (diff) | |
Add colorpicker to change calendar color, fixes #317"
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/colorpicker.html | 9 | ||||
| -rw-r--r-- | templates/main.php | 12 |
2 files changed, 17 insertions, 4 deletions
diff --git a/templates/colorpicker.html b/templates/colorpicker.html new file mode 100644 index 00000000..c5058b0e --- /dev/null +++ b/templates/colorpicker.html @@ -0,0 +1,9 @@ +<ul class="colorpicker-list"> + <li ng-repeat="color in colors" + ng-class="{ selected: (color===selected) }" + ng-click="pick(color)" + ng-style="{ 'background-color':color}; "></li> + <!--<li class="randomcolour" + ng-click="randomizeColour()" + ng-style="{ 'background-color':random}; "></li>--> +</ul> diff --git a/templates/main.php b/templates/main.php index 9e2ccd84..492ac564 100644 --- a/templates/main.php +++ b/templates/main.php @@ -57,9 +57,9 @@ </div> <div class="app-navigation-entry-menu" ng-show="calendar.writable"> <ul> - <li title="<?php p($l->t('Rename')); ?>" ng-click="startRename(calendar)" > + <li title="<?php p($l->t('Edit')); ?>" ng-click="startEdit(calendar)" > <img class="icon-rename svg" src="<?php p(image_path('core', 'actions/rename.svg'))?>"/> - <span><?php p($l->t('Rename')); ?></span> + <span><?php p($l->t('Edit')); ?></span> </li> <li title="<?php p($l->t('Delete')); ?>" ng-click="delete(calendar)"> <img class="icon-delete svg" src="<?php p(image_path('core', 'actions/delete.svg'))?>"/> @@ -69,9 +69,13 @@ </div> <div class="app-navigation-entry-edit"> <form> - <input ng-model="calendar.displayname" class="edit" type="text" ng-keydown="cancelRename($event,calendar)" autofocus-on-insert> - <input type="submit" value="" class="action icon-checkmark svg" ng-click="rename(calendar)"> + <input ng-model="calendar.displayname" class="edit" type="text" ng-keydown="checkKey($event,calendar)" autofocus-on-insert> + <input type="cancel" value="" class="action icon-close svg" ng-click="cancelEdit(calendar)" title="<?php p($l->t('Cancel')); ?>"> + <input type="submit" value="" class="action icon-checkmark svg" ng-click="saveEdit(calendar)" title="<?php p($l->t('Save')); ?>"> </form> + <colorpicker class="colorpicker" + selected="calendar.color"> + </colorpicker> </div> </li> <li class="newList handler" ng-class="{edit: status.addingList}"> |