NEW Show the allowed extensions as a toggle tip as per trac 7993

NEW Added a behat test for showing extension trac 7993
silverstripe · Dec 19, 2012 · 561e629 · 561e629
1 parent f72a024
commit 561e629
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 8 deletions.
diff --git a/css/AssetUploadField.css b/css/AssetUploadField.css
diff --git a/javascript/AssetUploadField.js b/javascript/AssetUploadField.js
@@ -16,4 +16,17 @@
 			this.find('.ss-uploadfield-editandorganize').show();
 		}
 	});
+	$('.ss-uploadfield-view-allowed-extensions').entwine({
+		onmatch: function() {
+			this.find('.description .toggle-content').hide();
+			this._super();
+		}
+	});
+
+	$('.ss-uploadfield-view-allowed-extensions .toggle').entwine({
+		onclick: function(e) {
+			jQuery(this).closest('.description').find('.toggle-content').toggle();
+			return false;
+		}
+	});
 }(jQuery));
diff --git a/lang/en.yml b/lang/en.yml
@@ -1,6 +1,7 @@
 en:
   AssetAdmin:
     ALLOWEDEXTS: 'Allowed extensions'
+    SHOWALLOWEDEXTS: 'Show allowed extensions'
     NEWFOLDER: NewFolder
   AssetTableField:
     CREATED: 'First uploaded'

diff --git a/scss/AssetUploadField.scss b/scss/AssetUploadField.scss
@@ -12,6 +12,11 @@
 	clear:both;
 	max-width:750px;
 	display:block;
+
+	.toggle {
+		font-style: normal;
+		font-size: $font-base-size;
+	}
 }
 
 #AssetUploadField {
@@ -273,9 +278,9 @@ body.cms.ss-uploadfield-edit-iframe, .composite.ss-assetuploadfield .details fie
 			}
 		}
 		.ss-uploadfield-fromcomputer {
-			/*position: relative;
+			/*position: relative; */
 			overflow: hidden;
-			display: block;*/
+			display: block;
 		}
 		.ss-uploadfield-item-uploador {
 			float: left;

diff --git a/templates/AssetUploadField.ss b/templates/AssetUploadField.ss
@@ -28,9 +28,11 @@
 	</div>
 
 	<span class="ss-uploadfield-view-allowed-extensions"> 
+		<span class="description">
 
-		<em><% _t('AssetAdmin.ALLOWEDEXTS', 'Allowed extensions') %></em>
-		$Extensions
+			<a href="#" class="toggle"><% _t('AssetAdmin.SHOWALLOWEDEXTS', 'Show allowed extensions') %></a>
+			<p class="toggle-content">$Extensions</p>
+		</span>	
 	</span>	
 
 	<div class="clear"><!-- --></div>

diff --git a/tests/behat/features/manage-files.feature b/tests/behat/features/manage-files.feature
@@ -81,4 +81,9 @@ Feature: Manage files
     # /show/0 is to ensure that we are on top level folder
     And I go to "/admin/assets/show/0"
     And I click on "folder2" in the "Files" table
-    And the "folder2" table should contain "file1"
+    And the "folder2" table should contain "file1"
+
+  Scenario: I can see allowed extensions help
+    When I go to "/admin/assets/add"
+    And I follow "Show allowed extensions"
+    Then I should see "png,"