added casting information for data objects

1 files changed, 8 insertions, 7 deletions

diff --git a/templates/part.addnew.php b/templates/part.addnew.php
index d7d549ad0..9a625e2f3 100644
--- a/templates/part.addnew.php
+++ b/templates/part.addnew.php
@@ -1,5 +1,5 @@
 <li class="add-new">
-	<a class="list-title list-title-with-icon" ng-click="showAdd=!showAdd" 
+	<a class="list-title list-title-with-icon"
 			oc-click-slide-toggle="{
 				selector: '.add-new-popup',
 				hideOnFocusLost: true
@@ -7,29 +7,30 @@
 		<?php p($l->t('New'))?>
 	</a>
 
-	<div class="add-new-popup" ng-class="{open:showAdd==true}">
+	<div class="add-new-popup">
 		<fieldset class="personalblock">
 			<legend><strong><?php p($l->t('Add Subscription')); ?></strong></legend>
 			<p class="error">
 				<span ng-show="feedEmptyError"><?php p($l->t('Address must not be empty!')); ?></span>
-				<span ng-show="feedExistsError"><?php p($l->t('Feed exists already!')); ?></span>
-				<span ng-show="feedError"><?php p($l->t('Could not add feed! Check if feed contains valid RSS!')); ?></span>
+				<span ng-show="feedError">
+					<?php p($l->t('Could not add feed! Check if feed contains valid RSS or exists already!')); ?>
+				</span>
 				<span ng-show="folderExistsError"><?php p($l->t('Folder exists already')); ?></span>
 			</p>
 			<form>
 				<input type="text" 
 					ng-model="feedUrl" 
 					placeholder="<?php p($l->t('Address')); ?>" 
-					ng-disabled="isAddingFeed()">
+					ng-disabled="isAddingFeed() || isAddingFolder()">
 				<button title="<?php p($l->t('Add')); ?>" 
-						ng-class="{loading: adding}"
+						ng-class="{loading: isAddingFeed()}"
 						ng-disabled="adding"
 						ng-click="addFeed(feedUrl, folderId)"><?php p($l->t('Add')); ?></button>
 				<select name="folder" 
 						data-create="<?php p($l->t('New folder')); ?>"
 						title="<?php p($l->t('Folder')); ?>"
 						ng-model="folderId"
-						ng-disabled="adding"
+						ng-disabled="isAddingFolder()"
 						ng-options="folder.name for folder in getFolders()"
 						add-folder-select>
 					<option value="" selected><?php p($l->t('No folder')); ?></option>