Skip to content

Commit

Permalink
Merge branch 'bs4' into fixradio
Browse files Browse the repository at this point in the history
  • Loading branch information
@guerler
guerler committed Apr 5, 2018
2 parents 4cfddc1 + c27434b commit b4a5b2a
Show file tree
Hide file tree
Showing 22 changed files with 164 additions and 227 deletions.
4 changes: 2 additions & 2 deletions client/galaxy/scripts/components/Citations.vue
View file
Expand Up @@ -2,11 +2,11 @@
<div class="toolForm">
<div class="toolFormTitle">
Citations
<button v-if="viewRender" v-on:click="toggleViewRender" type="button" class="btn btn-xs citations-to-bibtex" title="Show all in BibTeX format.">
<button v-if="viewRender" v-on:click="toggleViewRender" type="button" class="btn btn-sm citations-to-bibtex" title="Show all in BibTeX format.">
<i class="fa fa-pencil-square-o"></i>
Show BibTeX
</button>
<button v-else type="button" v-on:click="toggleViewRender" class="btn btn-xs citations-to-formatted" title="Return to formatted citation list.">
<button v-else type="button" v-on:click="toggleViewRender" class="btn btn-sm citations-to-formatted" title="Return to formatted citation list.">
<i class="fa fa-times"></i>
Hide BibTeX
</button>
Expand Down
16 changes: 8 additions & 8 deletions client/galaxy/scripts/components/RuleCollectionBuilder.vue
View file
@@ -1,6 +1,6 @@
<template>
<state-div v-if="state == 'build'">
<!-- Different instructions if building up from individual datasets vs.
<!-- Different instructions if building up from individual datasets vs.
initial data import. -->
<div class="header flex-row no-flex" v-if="ruleView == 'source'">
The is an advanced setting, below is a raw JSON description of the rules to apply to the tabular data used. The alternative graphical editor is recommended for most usages.
Expand Down Expand Up @@ -182,7 +182,7 @@
v-for="map in mapping"
v-bind:index="map.index"
v-bind:key="map.type">
<column-selector
<column-selector
:class="'rule-map-' + map.type.replace(/_/g, '-')"
:label="mappingTargets()[map.type].label"
:target.sync="map.columns"
Expand All @@ -205,7 +205,7 @@
</li>
</ul>
</div>
<button type="button" class="ui-button-default btn btn-default rule-mapping-ok" v-if="!hasActiveMappingEdit" @click="displayRuleType = null">Okay</button>
<button type="button" class="ui-button-default btn btn-secondary rule-mapping-ok" v-if="!hasActiveMappingEdit" @click="displayRuleType = null">Okay</button>
</div>
</div>
<div class="rule-summary" v-if="displayRuleType == null">
Expand Down Expand Up @@ -276,8 +276,8 @@
<rule-target-component :builder="this" rule-type="add_column_value" />
<rule-target-component :builder="this" rule-type="add_column_substr" />
</ul>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
Expand Down Expand Up @@ -325,7 +325,7 @@
</label>
<label class="rule-option pull-right" v-if="mappingAsDict.list_identifiers && !mappingAsDict.collection_name">
{{ l("Name") }}:
<input class="collection-name" style="width: 260px"
<input class="collection-name" style="width: 260px"
:placeholder="namePlaceholder" v-model="collectionName" />
</label>
<option-buttons-div>
Expand Down Expand Up @@ -1112,7 +1112,7 @@ const ColumnSelector = {
</label>
</div>
<div class="rule-column-selector" v-else>
{{ label }}
{{ label }}
<ol>
<li v-for="(targetEl, index) in target"
v-bind:index="index"
Expand Down Expand Up @@ -1360,7 +1360,7 @@ const RuleComponent = {
<div v-if="ruleType == displayRuleType" class="rule-editor" :class="typeToClass">
<slot></slot>
<div class="buttons" style="margin: 5px; height: 25px;">
<button type="button" class="ui-button-default btn btn-default rule-editor-ok" @click="okay">Okay</button>
<button type="button" class="ui-button-default btn btn-secondary rule-editor-ok" @click="okay">Okay</button>
<button type="button" class="ui-button-default btn rule-editor-cancel" @click="cancel">Cancel</button>
</div>
</div>`,
Expand Down
29 changes: 22 additions & 7 deletions client/galaxy/scripts/mvc/grid/grid-template.js
View file
@@ -1,5 +1,9 @@
// dependencies
import Utils from "utils/utils";
import * as _ from "underscore";

/* global $ */

// grid view templates
export default {
// template
Expand All @@ -8,11 +12,22 @@ export default {
if (options.embedded) {
tmpl = this.grid_header(options) + this.grid_table(options);
} else {
tmpl = `<div class="loading-elt-overlay"></div><table><tr><td width="75%">${this.grid_header(
options
)}</td><td></td><td></td></tr><tr><td width="100%" id="grid-message" valign="top"></td><td></td><td></td></tr></table>${this.grid_table(
options
)}`;
tmpl = `
<div class="loading-elt-overlay"></div>
<table>
<tr>
<td width="75%">${this.grid_header(options)}</td>
<td></td>
<td></td>
</tr>
<tr>
<td width="100%" id="grid-message" valign="top"></td>
<td></td>
<td></td>
</tr>
</table>
${this.grid_table(options)}
`;
}

// add info text
Expand Down Expand Up @@ -156,7 +171,7 @@ export default {
var target = column_settings.target;

// unescape value
if (jQuery.type(value) === "string") {
if ($.type(value) === "string") {
value = value.replace(/\/\//g, "/");
}

Expand Down Expand Up @@ -458,7 +473,7 @@ export default {
var column_filter = filters[column_key];
if (column_filter) {
// identify type
var type = jQuery.type(column_filter);
var type = $.type(column_filter);

// single filter value
if (type == "string") {
Expand Down
24 changes: 12 additions & 12 deletions client/galaxy/scripts/mvc/library/library-dataset-view.js
View file
Expand Up @@ -621,12 +621,12 @@ var LibraryDatasetView = Backbone.View.extend({

// BREADCRUMBS
'<ol class="breadcrumb">',
'<li><a title="Return to the list of libraries" href="#">Libraries</a></li>',
'<li class="breadcrumb-item"><a title="Return to the list of libraries" href="#">Libraries</a></li>',
'<% _.each(item.get("full_path"), function(path_item) { %>',
"<% if (path_item[0] != item.id) { %>",
'<li><a title="Return to this folder" href="#/folders/<%- path_item[0] %>"><%- path_item[1] %></a> </li> ',
'<li class="breadcrumb-item"><a title="Return to this folder" href="#/folders/<%- path_item[0] %>"><%- path_item[1] %></a> </li> ',
"<% } else { %>",
'<li class="active"><span title="You are here"><%- path_item[1] %></span></li>',
'<li class="breadcrumb-item active"><span title="You are here"><%- path_item[1] %></span></li>',
"<% } %>",
"<% }); %>",
"</ol>",
Expand Down Expand Up @@ -789,12 +789,12 @@ var LibraryDatasetView = Backbone.View.extend({

// BREADCRUMBS
'<ol class="breadcrumb">',
'<li><a title="Return to the list of libraries" href="#">Libraries</a></li>',
'<li class="breadcrumb-item"><a title="Return to the list of libraries" href="#">Libraries</a></li>',
'<% _.each(item.get("full_path"), function(path_item) { %>',
"<% if (path_item[0] != item.id) { %>",
'<li><a title="Return to this folder" href="#/folders/<%- path_item[0] %>"><%- path_item[1] %></a> </li> ',
'<li class="breadcrumb-item"><a title="Return to this folder" href="#/folders/<%- path_item[0] %>"><%- path_item[1] %></a> </li> ',
"<% } else { %>",
'<li class="active"><span title="You are here"><%- path_item[1] %></span></li>',
'<li class="breadcrumb-item active"><span title="You are here"><%- path_item[1] %></span></li>',
"<% } %>",
"<% }); %>",
"</ol>",
Expand Down Expand Up @@ -916,12 +916,12 @@ var LibraryDatasetView = Backbone.View.extend({

// BREADCRUMBS
'<ol class="breadcrumb">',
'<li><a title="Return to the list of libraries" href="#">Libraries</a></li>',
'<li class="breadcrumb-item"><a title="Return to the list of libraries" href="#">Libraries</a></li>',
'<% _.each(item.get("full_path"), function(path_item) { %>',
"<% if (path_item[0] != item.id) { %>",
'<li><a title="Return to this folder" href="#/folders/<%- path_item[0] %>"><%- path_item[1] %></a> </li> ',
'<li class="breadcrumb-item"><a title="Return to this folder" href="#/folders/<%- path_item[0] %>"><%- path_item[1] %></a> </li> ',
"<% } else { %>",
'<li class="active"><span title="You are here"><%- path_item[1] %></span></li>',
'<li class="breadcrumb-item active"><span title="You are here"><%- path_item[1] %></span></li>',
"<% } %>",
"<% }); %>",
"</ol>",
Expand Down Expand Up @@ -1022,12 +1022,12 @@ var LibraryDatasetView = Backbone.View.extend({

// BREADCRUMBS
'<ol class="breadcrumb">',
'<li><a title="Return to the list of libraries" href="#">Libraries</a></li>',
'<li class="breadcrumb-item"><a title="Return to the list of libraries" href="#">Libraries</a></li>',
'<% _.each(item.get("full_path"), function(path_item) { %>',
"<% if (path_item[0] != item.id) { %>",
'<li><a title="Return to this folder" href="#/folders/<%- path_item[0] %>"><%- path_item[1] %></a> </li> ',
'<li class="breadcrumb-item"><a title="Return to this folder" href="#/folders/<%- path_item[0] %>"><%- path_item[1] %></a> </li> ',
"<% } else { %>",
'<li class="active"><span title="You are here"><%- path_item[1] %></span></li>',
'<li class="breadcrumb-item active"><span title="You are here"><%- path_item[1] %></span></li>',
"<% } %>",
"<% }); %>",
"</ol>",
Expand Down
9 changes: 4 additions & 5 deletions client/galaxy/scripts/mvc/library/library-folderlist-view.js
View file
Expand Up @@ -367,14 +367,13 @@ var FolderListView = Backbone.View.extend({
templateFolder: function() {
return _.template(
[
// BREADCRUMBS
'<ol class="breadcrumb">',
'<li><a title="Return to the list of libraries" href="#">Libraries</a></li>',
'<li class="breadcrumb-item"><a title="Return to the list of libraries" href="#">Libraries</a></li>',
"<% _.each(path, function(path_item) { %>",
"<% if (path_item[0] != id) { %>",
'<li><a title="Return to this folder" href="#/folders/<%- path_item[0] %>"><%- path_item[1] %></a> </li> ',
'<li class="breadcrumb-item"><a title="Return to this folder" href="#/folders/<%- path_item[0] %>"><%- path_item[1] %></a> </li> ',
"<% } else { %>",
'<li class="active"><span title="You are in this folder"><%- path_item[1] %></span></li>',
'<li class="breadcrumb-item active"><span title="You are in this folder"><%- path_item[1] %></span></li>',
"<% } %>",
"<% }); %>",
"</ol>",
Expand All @@ -395,7 +394,7 @@ var FolderListView = Backbone.View.extend({
'<tbody id="folder_list_body">',
'<tr id="first_folder_item">',
"<td>",
'<a href="#<% if (upper_folder_id !== 0){ print("folders/" + upper_folder_id)} %>" title="Go to parent folder" class="btn_open_folder btn btn-secondary btn-xs">..<a>',
'<a href="#<% if (upper_folder_id !== 0){ print("folders/" + upper_folder_id)} %>" title="Go to parent folder" class="btn_open_folder btn btn-secondary btn-sm">..<a>',
"</td>",
"<td></td>",
"<td></td>",
Expand Down
14 changes: 7 additions & 7 deletions client/galaxy/scripts/mvc/library/library-folderrow-view.js
View file
Expand Up @@ -256,18 +256,18 @@ var FolderRowView = Backbone.View.extend({
"<td></td>",
"<td>",
"<% if(edit_mode) { %>", // start edit mode
'<button data-toggle="tooltip" data-placement="top" title="Save changes" class="primary-button btn-xs save_folder_btn" type="button" style="<% if(button_config.save_folder_btn === false) { print("display:none;") } %>">',
'<button data-toggle="tooltip" data-placement="top" title="Save changes" class="primary-button btn-sm save_folder_btn" type="button" style="<% if(button_config.save_folder_btn === false) { print("display:none;") } %>">',
'<span class="fa fa-floppy-o"/> Save',
"</button>",
'<button data-toggle="tooltip" data-placement="top" title="Discard changes" class="primary-button btn-xs cancel_folder_btn" type="button" style="<% if(button_config.cancel_folder_btn === false) { print("display:none;") } %>">',
'<button data-toggle="tooltip" data-placement="top" title="Discard changes" class="primary-button btn-sm cancel_folder_btn" type="button" style="<% if(button_config.cancel_folder_btn === false) { print("display:none;") } %>">',
'<span class="fa fa-times"/> Cancel',
"</button>",
"<% } else if (!edit_mode){%>", // start no edit mode
'<button data-toggle="tooltip" data-placement="top" title="Modify \'<%- content_item.get("name") %>\'" class="primary-button btn-xs edit_folder_btn" type="button" style="<% if(button_config.edit_folder_btn === false) { print("display:none;") } %>">',
'<button data-toggle="tooltip" data-placement="top" title="Modify \'<%- content_item.get("name") %>\'" class="primary-button btn-sm edit_folder_btn" type="button" style="<% if(button_config.edit_folder_btn === false) { print("display:none;") } %>">',
'<span class="fa fa-pencil"/> Edit',
"</button>",
'<a href="#/folders/<%- content_item.id %>/permissions">',
'<button data-toggle="tooltip" data-placement="top" class="primary-button btn-xs permission_folder_btn" title="Permissions of \'<%- content_item.get("name") %>\'" style="<% if(button_config.permission_folder_btn === false) { print("display:none;") } %>">',
'<button data-toggle="tooltip" data-placement="top" class="primary-button btn-sm permission_folder_btn" title="Permissions of \'<%- content_item.get("name") %>\'" style="<% if(button_config.permission_folder_btn === false) { print("display:none;") } %>">',
'<span class="fa fa-group"/> Manage',
"</button>",
"</a>",
Expand Down Expand Up @@ -314,7 +314,7 @@ var FolderRowView = Backbone.View.extend({
"<% } %>",
'<% if (content_item.get("can_manage")) { %>',
'<a href="#folders/<%- content_item.get("folder_id") %>/datasets/<%- content_item.id %>/permissions">',
'<button data-toggle="tooltip" data-placement="top" class="primary-button btn-xs permissions-dataset-btn" title="Permissions of \'<%- content_item.get("name") %>\'">',
'<button data-toggle="tooltip" data-placement="top" class="primary-button btn-sm permissions-dataset-btn" title="Permissions of \'<%- content_item.get("name") %>\'">',
'<span class="fa fa-group"/> Manage',
"</button>",
"</a>",
Expand Down Expand Up @@ -355,7 +355,7 @@ var FolderRowView = Backbone.View.extend({
"</td>",
"<td>",
'<span data-toggle="tooltip" data-placement="top" title="Marked deleted" style="color:grey;" class="fa fa-ban fa-lg"/>',
'<button data-toggle="tooltip" data-placement="top" title="Undelete \'<%- content_item.get("name") %>\'" class="primary-button btn-xs undelete_dataset_btn" type="button" style="margin-left:1em;">',
'<button data-toggle="tooltip" data-placement="top" title="Undelete \'<%- content_item.get("name") %>\'" class="primary-button btn-sm undelete_dataset_btn" type="button" style="margin-left:1em;">',
'<span class="fa fa-unlock"/> Undelete',
"</button>",
"</td>",
Expand Down Expand Up @@ -388,7 +388,7 @@ var FolderRowView = Backbone.View.extend({
"<td></td>",
"<td>",
'<span data-toggle="tooltip" data-placement="top" title="Marked deleted" style="color:grey;" class="fa fa-ban fa-lg"/>',
'<button data-toggle="tooltip" data-placement="top" title="Undelete \'<%- content_item.get("name") %>\'" class="primary-button btn-xs undelete_folder_btn" type="button" style="margin-left:1em;">',
'<button data-toggle="tooltip" data-placement="top" title="Undelete \'<%- content_item.get("name") %>\'" class="primary-button btn-sm undelete_folder_btn" type="button" style="margin-left:1em;">',
'<span class="fa fa-unlock"/> Undelete',
"</button>",
"</td>",
Expand Down

0 comments on commit b4a5b2a

Please sign in to comment.