From 905ddd5b20b0444155b1fec5d7c8642894274435 Mon Sep 17 00:00:00 2001 From: scott1702 Date: Thu, 5 Nov 2015 18:36:59 +1300 Subject: [PATCH] move allowed extensions into a sidebar --- css/AssetUploadField.css | 12 +++++---- css/AssetUploadField.css.map | 2 +- javascript/AssetUploadField.js | 13 ++++----- scss/AssetUploadField.scss | 49 +++++++++++++++++++++------------- templates/AssetUploadField.ss | 5 ++-- 5 files changed, 46 insertions(+), 35 deletions(-) diff --git a/css/AssetUploadField.css b/css/AssetUploadField.css index 19e4a4fff..ed7de6a9d 100644 --- a/css/AssetUploadField.css +++ b/css/AssetUploadField.css @@ -10,10 +10,12 @@ /*Mixin used to generate slightly smaller text and forms Used in side panels and action tabs */ -.ss-uploadfield-view-allowed-extensions { margin-top: -42px; max-width: 400px; width: 30%; background: #ECEFF1; display: block; float: right; position: relative; } -.ss-uploadfield-view-allowed-extensions .toggle { font-style: normal; font-size: 16px; float: right; color: #9ba5ae; position: absolute; top: 4px; right: 0; width: 16px; height: 16px; overflow: hidden; } -.ss-uploadfield-view-allowed-extensions .toggle:hover, .ss-uploadfield-view-allowed-extensions .toggle:active, .ss-uploadfield-view-allowed-extensions .toggle:focus { text-decoration: none; color: #66727d; } -.ss-uploadfield-view-allowed-extensions h4 { margin: 0 0 6px; padding-right: 20px; } +.ss-uploadfield-view-allowed-extensions { margin-top: -42px; float: right; } +.ss-uploadfield-view-allowed-extensions .toggle-content { opacity: 0; box-sizing: border-box; position: absolute; z-index: 1; padding: 20px 16px; width: 280px; right: -280px; top: 0; bottom: 0; border-left: 1px solid #C1C7CC; box-shadow: 0 0 3px #C1C7CC; background: #ECEFF1; transition: all .3s linear; } +.ss-uploadfield-view-allowed-extensions .toggle-content h4 { margin: 0 0 6px; padding-right: 20px; } +.ss-uploadfield-view-allowed-extensions.active .toggle-content { right: 0; opacity: 1; } +.ss-uploadfield-view-allowed-extensions .toggle { cursor: pointer; font-size: 16px; float: right; color: #66727d; width: 16px; height: 16px; overflow: hidden; } +.ss-uploadfield-view-allowed-extensions .toggle:hover, .ss-uploadfield-view-allowed-extensions .toggle:active, .ss-uploadfield-view-allowed-extensions .toggle:focus { text-decoration: none; color: #4f5861; } .backlink { padding-left: 12px; } @@ -23,7 +25,7 @@ body.cms.ss-uploadfield-edit-iframe .fieldholder-small label, .composite.ss-asse .composite.ss-assetuploadfield .details fieldset { padding: 16px; } -.ss-assetuploadfield { border-bottom: 0; -moz-box-shadow: none; -webkit-box-shadow: none; box-shadow: none; margin: 0; position: relative; padding: 0; } +.ss-assetuploadfield { border-bottom: 0; -moz-box-shadow: none; -webkit-box-shadow: none; box-shadow: none; margin: 0; padding: 0; } .ss-assetuploadfield h3 { border-bottom: 1px solid rgba(201, 205, 206, 0.8); -moz-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.8); -webkit-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.8); box-shadow: 0 1px 0 rgba(255, 255, 255, 0.8); margin: 0 0 8px; padding: 0 0 7px; clear: both; position: relative; } .ss-assetuploadfield .field { border-bottom: 0; box-shadow: none; } .ss-assetuploadfield .fileOverview { clear: both; margin-top: 10px; position: relative; } diff --git a/css/AssetUploadField.css.map b/css/AssetUploadField.css.map index 03a3f54b6..7a8266c69 100644 --- a/css/AssetUploadField.css.map +++ b/css/AssetUploadField.css.map @@ -1,6 +1,6 @@ { "version": 3, -"mappings": "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", +"mappings": "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", "sources": ["../scss/AssetUploadField.scss","../admin/scss/themes/_default.scss","../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/_support.scss","../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/css3/_box-shadow.scss","../admin/scss/_mixins.scss","../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/css3/_border-radius.scss","../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/css3/_background-clip.scss","../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/css3/_images.scss","../scss/_elementMixins.scss","../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/css3/_text-shadow.scss"], "names": [], "file": "AssetUploadField.css" diff --git a/javascript/AssetUploadField.js b/javascript/AssetUploadField.js index a63c3a130..5ebbdfa4c 100644 --- a/javascript/AssetUploadField.js +++ b/javascript/AssetUploadField.js @@ -16,17 +16,14 @@ 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; + var allowedExt = this.closest('.ss-uploadfield-view-allowed-extensions'), + minHeightVal = this.closest('.ui-tabs-panel').height() + 20; + + allowedExt.toggleClass('active'); + allowedExt.find('.toggle-content').css('minHeight', minHeightVal); } }); }(jQuery)); diff --git a/scss/AssetUploadField.scss b/scss/AssetUploadField.scss index 5c114d6d8..ba6e31338 100644 --- a/scss/AssetUploadField.scss +++ b/scss/AssetUploadField.scss @@ -6,24 +6,41 @@ @import "../admin/scss/_mixins"; @import "_elementMixins"; -// Temporary. To be hidden and replaced with javascript tooltip -.ss-uploadfield-view-allowed-extensions { +.ss-uploadfield-view-allowed-extensions { margin-top: -42px; - max-width: 400px; - width: 30%; - background: $tab-panel-texture-color; - display: block; float: right; - position: relative; + + .toggle-content { + opacity: 0; + box-sizing: border-box; + position: absolute; + z-index: 1; + padding: 2.5*$grid-y 2*$grid-x; + width: 280px; + right: -280px; + top: 0; + bottom: 0; + border-left: 1px solid $color-separator; + box-shadow: 0 0 3px $color-separator; + background: $tab-panel-texture-color; + transition: all .3s linear; + + h4 { + margin: 0 0 6px; + padding-right: 20px; + } + } + + &.active .toggle-content { + right: 0; + opacity: 1; + } .toggle { - font-style: normal; + cursor: pointer; font-size: 16px; float: right; - color: lighten($color-text, 20%); - position: absolute; - top: 4px; - right: 0; + color: $color-text; width: 16px; height: 16px; overflow: hidden; @@ -32,14 +49,9 @@ &:active, &:focus { text-decoration: none; - color: $color-text; + color: darken($color-text, 10%);; } } - - h4 { - margin: 0 0 6px; - padding-right: 20px; - } } .backlink { @@ -72,7 +84,6 @@ body.cms.ss-uploadfield-edit-iframe { border-bottom: 0; @include box-shadow(none); margin: 0; - position: relative; padding: 0; h3 { diff --git a/templates/AssetUploadField.ss b/templates/AssetUploadField.ss index b2ac977e1..1cb1c61e8 100644 --- a/templates/AssetUploadField.ss +++ b/templates/AssetUploadField.ss @@ -10,9 +10,10 @@ - <%t AssetAdmin.SHOWALLOWEDEXTS 'Show allowed extensions' %> + <%t AssetAdmin.SHOWALLOWEDEXTS 'Show allowed extensions' %>
-

Allowed file upload extensions

+ <%t AssetAdmin.HIDEALLOWEDEXTS 'Hide allowed extensions' %> +

<%t AssetAdmin.ALLOWEDEXTS 'Allowed file upload extensions' %>

$Extensions