From 66c73a96ac2dda076bcfe0dc0a1ca2a7e169149d Mon Sep 17 00:00:00 2001 From: Bernhard Posselt Date: Tue, 21 Oct 2014 18:19:23 +0200 Subject: first try to set indention limit at 80 characters in php --- templates/part.navigation.folder.php | 72 +++++++++++++++++++++++++++--------- 1 file changed, 55 insertions(+), 17 deletions(-) (limited to 'templates/part.navigation.folder.php') diff --git a/templates/part.navigation.folder.php b/templates/part.navigation.folder.php index 4c0874f9f..20b1978ac 100644 --- a/templates/part.navigation.folder.php +++ b/templates/part.navigation.folder.php @@ -23,20 +23,33 @@
-
t('Deleted folder')); ?>: {{ folder.name }}
+
+ t('Deleted folder')); ?>: {{ folder.name }} +
+ ng-class="{ + 'folder-rename-error': + folder.renameError || + (folderName != folder.name && + !Navigation.renamingFolder && + Navigation.folderNameExists(folderName)) + }">
@@ -45,19 +58,28 @@ ng-class="{'entry-loading': Navigation.renamingFolder}" title="t('Rename')); ?>" class="action icon-checkmark" - ng-disabled="folderName != folder.name && !Navigation.renamingFolder && Navigation.folderNameExists(folderName)"> + ng-disabled="folderName != folder.name && + !Navigation.renamingFolder && + Navigation.folderNameExists(folderName)">
-

+

t('Folder exists already!')); ?>

-

{{ folder.renameError }}

+

+ {{ folder.renameError }} +

+ ng-show="!folder.editing && + !folder.error && + !folder.deleted && + folder.id"> {{ folder.name }} @@ -66,12 +88,17 @@
+ ng-show="folder.id && + !folder.editing && + !folder.error && + !folder.deleted">