use images instead of captions for folder create buttons to not run into width problems

2 files changed, 26 insertions, 12 deletions

diff --git a/css/addnew.css b/css/addnew.css
index 39b7c4d60..942de2eb2 100644
--- a/css/addnew.css
+++ b/css/addnew.css
@@ -47,14 +47,27 @@
 	margin-top: 1px;
 }
 
+.add-new .action-button {
+	width: 30px;
+	background-position: center;
+	background-repeat: no-repeat;	
+}
+
 .add-new .back-button {
 	border-radius: 0;
-	width: 30px;
 	background-image: url('%webroot%/core/img/actions/delete.svg');
-	background-position: center;
-	background-repeat: no-repeat;
 }
 
-.add-new .back-button:hover {
-	background-image: url('%webroot%/core/img/actions/delete-hover.svg');
+.add-new .new-button {
+	border-radius: 0;
+	background-image: url('%appswebroot%/news/img/add.svg');
+	border-top-right-radius: 5px; 
+	border-bottom-right-radius: 5px; 
+}
+
+.add-new .create-button {
+	border-radius: 0;
+	background-image: url('%appswebroot%/news/img/mark_read.svg');
+	border-top-right-radius: 5px; 
+	border-bottom-right-radius: 5px; 
 }
\ No newline at end of file
diff --git a/templates/part.addnew.php b/templates/part.addnew.php
index 9e64a4a03..673ca8ba6 100644
--- a/templates/part.addnew.php
+++ b/templates/part.addnew.php
@@ -51,9 +51,10 @@
 						ng-hide="addNewFolder">
 					<option value="" selected="selected"><?php p($l->t('Choose folder')); ?></option>
 				</select>
-				<button title="<?php p($l->t('Add')); ?>" 
+				<button title="<?php p($l->t('New folder')); ?>" 
 						ng-click="addNewFolder=true"
-						ng-hide="addNewFolder"><?php p($l->t('New')); ?></button>
+						ng-hide="addNewFolder"
+						class="action-button new-button action"></button>
 				<input type="text" 
 						ng-model="folderName" 
 						ng-disabled="isAddingFolder()"
@@ -62,17 +63,17 @@
 						placeholder="<?php p($l->t('Folder name')); ?>" 
 						autofocus
 						ui-keyup="{13: 'addFolder(folderName)'}"/>
-				<button title="<?php p($l->t('Back')); ?>" 
+				<button title="<?php p($l->t('Back to folder selection')); ?>" 
 						ng-show="addNewFolder"
 						ng-click="addNewFolder=false"
 						ng-disabled="isAddingFolder()"
-						class="back-button"></button>
-				<button title="<?php p($l->t('Add')); ?>" 
+						class="action-button back-button action"></button>
+				<button title="<?php p($l->t('Create folder')); ?>" 
 						ng-show="addNewFolder"
 						ng-click="addFolder(folderName)"
 						ng-disabled="isAddingFolder()"
-						ng-class="{loading: isAddingFolder()}">
-						<?php p($l->t('Create')); ?>
+						ng-class="{loading: isAddingFolder()}"
+						class="action-button create-button action">
 				</button>
 			</form>	
 		</fieldset>