opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

move text out of icon spans for library dataset view

Browse Source 
also re-touch the html to be better readable
This commit is contained in:
Martin Cech
2016-03-24 13:12:02 -04:00
parent 909a5491e5
commit ab31bd9f48
7 changed files with 95 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/galaxy/scripts/mvc/library/library-dataset-view.js
+69 -26
View File
@@ -30,9 +30,7 @@ var LibraryDatasetView = Backbone.View.extend({
"click .btn-make-private" : "makeDatasetPrivate",
"click .btn-remove-restrictions" : "removeDatasetRestrictions",
"click .toolbtn_save_permissions" : "savePermissions",
"click .toolbtn_save_modifications" : "comingSoon",
// "click .btn-share-dataset" : "comingSoon"
},
@@ -585,15 +583,26 @@ var LibraryDatasetView = Backbone.View.extend({
'<div class="library_style_container">',
'<div id="library_toolbar">',
'<button data-toggle="tooltip" data-placement="top" title="Download dataset" class="btn btn-default toolbtn-download-dataset primary-button toolbar-item" type="button">',
'<span class="fa fa-download"> Download</span>',
'<span class="fa fa-download"></span>',
'&nbsp;Download',
'</button>',
'<button data-toggle="tooltip" data-placement="top" title="Import dataset into history" class="btn btn-default toolbtn-import-dataset primary-button toolbar-item" type="button">',
'<span class="fa fa-book"></span>',
'&nbsp;to History',
'</button>',
'<button data-toggle="tooltip" data-placement="top" title="Import dataset into history" class="btn btn-default toolbtn-import-dataset primary-button toolbar-item" type="button"><span class="fa fa-book"> to History</span></button>',
'<% if (item.get("can_user_modify")) { %>',
'<button data-toggle="tooltip" data-placement="top" title="Modify library item" class="btn btn-default toolbtn_modify_dataset primary-button toolbar-item" type="button"><span class="fa fa-pencil"> Modify</span></button>',
'<button data-toggle="tooltip" data-placement="top" title="Modify library item" class="btn btn-default toolbtn_modify_dataset primary-button toolbar-item" type="button">',
'<span class="fa fa-pencil"></span>',
'&nbsp;Modify',
'</button>',
'<% } %>',
'<% if (item.get("can_user_manage")) { %>',
'<a href="#folders/<%- item.get("folder_id") %>/datasets/<%- item.id %>/permissions"><button data-toggle="tooltip" data-placement="top" title="Manage permissions" class="btn btn-default toolbtn_change_permissions primary-button toolbar-item" type="button"><span class="fa fa-group"></span> Permissions</span></button></a>',
// '<button data-toggle="tooltip" data-placement="top" title="Share dataset" class="btn btn-default toolbtn-share-dataset primary-button toolbar-item" type="button"><span class="fa fa-share"> Share</span></button>',
'<a href="#folders/<%- item.get("folder_id") %>/datasets/<%- item.id %>/permissions">',
'<button data-toggle="tooltip" data-placement="top" title="Manage permissions" class="btn btn-default toolbtn_change_permissions primary-button toolbar-item" type="button">',
'<span class="fa fa-group"></span>',
'&nbsp;Permissions',
'</button>',
'</a>',
'<% } %>',
'</div>',
@@ -613,7 +622,8 @@ var LibraryDatasetView = Backbone.View.extend({
'<div class="alert alert-info">',
'This dataset is unrestricted so everybody can access it. Just share the URL of this page. ',
'<button data-toggle="tooltip" data-placement="top" title="Copy to clipboard" class="btn btn-default btn-copy-link-to-clipboard primary-button" type="button">',
'<span class="fa fa-clipboard"> To Clipboard</span>',
'<span class="fa fa-clipboard"></span>',
'&nbsp;To Clipboard',
'</button> ',
'</div>',
'<% } %>',
@@ -726,7 +736,12 @@ var LibraryDatasetView = Backbone.View.extend({
// CONTAINER START
'<div class="library_style_container">',
'<div id="library_toolbar">',
'<a href="#folders/<%- item.get("folder_id") %>/datasets/<%- item.id %>"><button data-toggle="tooltip" data-placement="top" title="Go to latest dataset" class="btn btn-default primary-button toolbar-item" type="button"><span class="fa fa-caret-left fa-lg"> Latest dataset</span></button><a>',
'<a href="#folders/<%- item.get("folder_id") %>/datasets/<%- item.id %>">',
'<button data-toggle="tooltip" data-placement="top" title="Go to latest dataset" class="btn btn-default primary-button toolbar-item" type="button">',
'<span class="fa fa-caret-left fa-lg"></span>',
'&nbsp;Latest dataset',
'</button>',
'<a>',
'</div>',
// BREADCRUMBS
@@ -838,8 +853,14 @@ var LibraryDatasetView = Backbone.View.extend({
// CONTAINER START
'<div class="library_style_container">',
'<div id="library_toolbar">',
'<button data-toggle="tooltip" data-placement="top" title="Cancel modifications" class="btn btn-default toolbtn_cancel_modifications primary-button toolbar-item" type="button"><span class="fa fa-times"> Cancel</span></button>',
'<button data-toggle="tooltip" data-placement="top" title="Save modifications" class="btn btn-default toolbtn_save_modifications primary-button toolbar-item" type="button"><span class="fa fa-floppy-o"> Save</span></button>',
'<button data-toggle="tooltip" data-placement="top" title="Cancel modifications" class="btn btn-default toolbtn_cancel_modifications primary-button toolbar-item" type="button">',
'<span class="fa fa-times"></span>',
'&nbsp;Cancel',
'</button>',
'<button data-toggle="tooltip" data-placement="top" title="Save modifications" class="btn btn-default toolbtn_save_modifications primary-button toolbar-item" type="button">',
'<span class="fa fa-floppy-o"></span>',
'&nbsp;Save',
'</button>',
'</div>',
// BREADCRUMBS
@@ -932,8 +953,18 @@ var LibraryDatasetView = Backbone.View.extend({
// CONTAINER START
'<div class="library_style_container">',
'<div id="library_toolbar">',
'<a href="#folders/<%- item.get("folder_id") %>"><button data-toggle="tooltip" data-placement="top" title="Go back to containing folder" class="btn btn-default primary-button toolbar-item" type="button"><span class="fa fa-folder-open-o"> Containing Folder</span></button></a>',
'<a href="#folders/<%- item.get("folder_id") %>/datasets/<%- item.id %>"><button data-toggle="tooltip" data-placement="top" title="Go back to dataset" class="btn btn-default primary-button toolbar-item" type="button"><span class="fa fa-file-o"> Dataset Details</span></button><a>',
'<a href="#folders/<%- item.get("folder_id") %>">',
'<button data-toggle="tooltip" data-placement="top" title="Go back to containing folder" class="btn btn-default primary-button toolbar-item" type="button">',
'<span class="fa fa-folder-open-o"></span>',
'&nbsp;Containing Folder',
'</button>',
'</a>',
'<a href="#folders/<%- item.get("folder_id") %>/datasets/<%- item.id %>">',
'<button data-toggle="tooltip" data-placement="top" title="Go back to dataset" class="btn btn-default primary-button toolbar-item" type="button">',
'<span class="fa fa-file-o"></span>',
'&nbsp;Dataset Details',
'</button>',
'<a>',
'</div>',
// BREADCRUMBS
@@ -964,30 +995,42 @@ var LibraryDatasetView = Backbone.View.extend({
'<hr/>',
'<h2>Dataset-related permissions</h2>',
'<div class="alert alert-warning">Changes made below will affect <strong>every</strong> library item that was created from this dataset and also every history this dataset is part of.</div>',
'<% if (!item.get("is_unrestricted")) { %>',
'<p>You can remove all access restrictions on this dataset. ',
'<button data-toggle="tooltip" data-placement="top" title="Everybody will be able to access the dataset." class="btn btn-default btn-remove-restrictions primary-button" type="button">',
'<span class="fa fa-globe"> Remove restrictions</span>',
'</button>',
'</p>',
'<button data-toggle="tooltip" data-placement="top" title="Everybody will be able to access the dataset." class="btn btn-default btn-remove-restrictions primary-button" type="button">',
'<span class="fa fa-globe"></span>',
'&nbsp;Remove restrictions',
'</button>',
'</p>',
'<% } else { %>',
'This dataset is unrestricted so everybody can access it. Just share the URL of this page.',
'<button data-toggle="tooltip" data-placement="top" title="Copy to clipboard" class="btn btn-default btn-copy-link-to-clipboard primary-button" type="button"><span class="fa fa-clipboard"> To Clipboard</span></button> ',
'<button data-toggle="tooltip" data-placement="top" title="Copy to clipboard" class="btn btn-default btn-copy-link-to-clipboard primary-button" type="button">',
'<span class="fa fa-clipboard"></span>',
'&nbsp;To Clipboard',
'</button>',
'<p>You can make this dataset private to you. ',
'<button data-toggle="tooltip" data-placement="top" title="Only you will be able to access the dataset." class="btn btn-default btn-make-private primary-button" type="button"><span class="fa fa-key"> Make Private</span></button>',
'<button data-toggle="tooltip" data-placement="top" title="Only you will be able to access the dataset." class="btn btn-default btn-make-private primary-button" type="button">',
'<span class="fa fa-key"></span>',
'&nbsp;Make Private',
'</button>',
'</p>',
// '<p>You can share this dataset privately with other Galaxy users. ',
// '<button data-toggle="tooltip" data-placement="top" title="Only you and the suers you choose will be able to access the dataset." class="btn btn-default btn-share-dataset primary-button" type="button"><span class="fa fa-share"> Share Privately</span></button>',
// '</p>',
'<% } %>',
'<h4>Roles that can access the dataset</h4>',
'<div id="access_perm" class="access_perm roles-selection"></div>',
'<div class="alert alert-info roles-selection">User has to have <strong>all these roles</strong> in order to access this dataset. Users without access permission <strong>cannot</strong> have other permissions on this dataset. If there are no access roles set on the dataset it is considered <strong>unrestricted</strong>.</div>',
'<div class="alert alert-info roles-selection">',
'User has to have <strong>all these roles</strong> in order to access this dataset.',
' Users without access permission <strong>cannot</strong> have other permissions on this dataset.',
' If there are no access roles set on the dataset it is considered <strong>unrestricted</strong>.',
'</div>',
'<h4>Roles that can manage permissions on the dataset</h4>',
'<div id="manage_perm" class="manage_perm roles-selection"></div>',
'<div class="alert alert-info roles-selection">User with <strong>any</strong> of these roles can manage permissions of this dataset. If you remove yourself you will loose the ability manage this dataset unless you are an admin.</div>',
'<button data-toggle="tooltip" data-placement="top" title="Save modifications made on this page" class="btn btn-default toolbtn_save_permissions primary-button" type="button"><span class="fa fa-floppy-o"> Save</span></button>',
'<div class="alert alert-info roles-selection">',
'User with <strong>any</strong> of these roles can manage permissions of this dataset. If you remove yourself you will loose the ability manage this dataset unless you are an admin.',
'</div>',
'<button data-toggle="tooltip" data-placement="top" title="Save modifications made on this page" class="btn btn-default toolbtn_save_permissions primary-button" type="button">',
'<span class="fa fa-floppy-o"></span>',
'&nbsp;Save',
'</button>',
'</div>',
// CONTAINER END
'</div>'
static/maps/mvc/library/library-dataset-view.js.map
+1 -1
View File
File diff suppressed because one or more lines are too long
static/scripts/bundled/analysis.bundled.js
+6 -6
View File
File diff suppressed because one or more lines are too long
static/scripts/bundled/analysis.bundled.js.map
+1 -1
View File
File diff suppressed because one or more lines are too long
static/scripts/bundled/libs.bundled.js
+16 -16
View File
File diff suppressed because one or more lines are too long
static/scripts/bundled/libs.bundled.js.map
+1 -1
View File
File diff suppressed because one or more lines are too long
static/scripts/mvc/library/library-dataset-view.js
+1 -1
View File
File diff suppressed because one or more lines are too long