From 19655c2cc345d88b94004c702f0c380149228fe1 Mon Sep 17 00:00:00 2001 From: Jamie Snape Date: Wed, 7 Oct 2015 15:03:43 -0400 Subject: [PATCH 1/5] Add ESLint configuration --- .eslintignore | 12 ++++++++++++ .eslintrc | 43 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+) create mode 100644 .eslintignore create mode 100644 .eslintrc diff --git a/.eslintignore b/.eslintignore new file mode 100644 index 000000000..89ce87161 --- /dev/null +++ b/.eslintignore @@ -0,0 +1,12 @@ +# Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. + +**/*.min.js +**/jqplot*.js +**/jquery*.js +bower_components/ +library/SwaggerUI/ +modules/{pvw,visualize}/public/js/jquery/colorpicker.js +modules/statistics/public/js/googlemaps/*.js +modules/visualize/public/js/{paraview,webgl}/*.js +node_modules/ +vendor/ diff --git a/.eslintrc b/.eslintrc new file mode 100644 index 000000000..658e0a9c8 --- /dev/null +++ b/.eslintrc @@ -0,0 +1,43 @@ +#============================================================================= +# Midas Server +# Copyright Kitware SAS, 26 rue Louis Guérin, 69100 Villeurbanne, France. +# All rights reserved. +# For more information visit http://www.kitware.com/. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0.txt +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +#============================================================================= + +--- +rules: + indent: + - 2 + - 4 + quotes: + - 2 + - single + linebreak-style: + - 2 + - unix + semi: + - 2 + - always + + no-unused-vars: + - 2 + - argsIgnorePattern: ^_ + +env: + browser: true + jquery: true + +extends: 'eslint:recommended' From 02e0bbb71fbf2a5f13e6c375191e1dd1234d3834 Mon Sep 17 00:00:00 2001 From: Jamie Snape Date: Wed, 7 Oct 2015 15:50:52 -0400 Subject: [PATCH 2/5] Fix various ESLint errors --- core/public/js/admin/admin.index.js | 50 +++++----- core/public/js/admin/admin.migrate.js | 26 ++--- core/public/js/admin/admin.upgrade.js | 6 +- core/public/js/apikey/apikey.usertab.js | 10 +- core/public/js/browse/browse.index.js | 16 ++-- core/public/js/browse/browse.movecopy.js | 19 ++-- core/public/js/browse/browse.selectfolder.js | 18 ++-- core/public/js/browse/browse.selectitem.js | 34 +++---- core/public/js/common/common.browser.js | 48 +++++----- core/public/js/common/common.feed.js | 8 +- core/public/js/community/community.create.js | 8 +- core/public/js/community/community.index.js | 4 +- .../js/community/community.invitation.js | 16 ++-- core/public/js/community/community.manage.js | 96 +++++++++---------- .../js/community/community.selectgroup.js | 8 +- core/public/js/community/community.view.js | 12 +-- .../js/element/serversidefilechooser.js | 34 +++---- core/public/js/feed/feed.index.js | 6 +- core/public/js/folder/folder.createfolder.js | 28 +++--- core/public/js/folder/folder.view.js | 14 +-- core/public/js/import/import.index.js | 80 ++++++++-------- core/public/js/install/install.step2.js | 13 ++- core/public/js/item/item.editmetadata.js | 4 +- core/public/js/item/item.view.js | 66 ++++++------- .../js/jquery/jquery.autogrow-textarea.js | 6 +- core/public/js/jquery/jquery.checkboxrange.js | 30 +++--- core/public/js/layout/midas.dialog.js | 26 ++--- core/public/js/layout/midas.empty.js | 7 -- core/public/js/layout/midas.layout.js | 65 ++++++------- core/public/js/layout/midas.notice.js | 1 - core/public/js/rest/rest.index.js | 18 +--- core/public/js/search/search.index.js | 42 ++++---- core/public/js/share/share.dialog.js | 74 +++++++------- core/public/js/upload/upload.revision.js | 8 +- core/public/js/upload/upload.simpleupload.js | 9 +- core/public/js/user/user.emailregister.js | 4 +- core/public/js/user/user.login.js | 6 +- core/public/js/user/user.manage.js | 70 +++++++------- core/public/js/user/user.recoverpassword.js | 2 +- core/public/js/user/user.register.js | 6 +- core/public/js/user/user.settings.js | 6 +- core/public/js/user/user.userpage.js | 10 +- .../public/js/upload/upload.index.js | 2 +- .../public/js/admin/admin.index.js | 20 ++-- .../public/js/item/dicomserver.item.view.js | 6 +- .../public/js/login/googleauth.login.js | 2 +- .../public/js/common/common.notify.js | 2 + .../public/js/upload/upload.index.js | 2 +- .../mfa/public/js/config/config.usertab.js | 2 +- modules/mfa/public/js/login/login.dialog.js | 2 +- .../oauth/public/js/client/client.index.js | 14 +-- .../pvw/public/js/paraview/paraview.common.js | 4 +- .../pvw/public/js/paraview/paraview.volume.js | 14 +-- .../public/js/executable/executable.define.js | 27 +++--- .../public/js/job/job.init.js | 52 +++++----- .../public/js/job/job.manage.js | 6 +- .../public/js/job/job.view.js | 8 +- .../public/js/layout/remoteprocessing.js | 2 +- .../public/js/folder/folder.index.js | 6 +- .../solr/public/js/advanced/advanced.index.js | 24 ++--- .../statistics/public/js/index/index.index.js | 6 +- .../statistics/public/js/item/item.index.js | 18 ++-- .../public/js/producer/producer.edit.js | 6 +- .../public/js/producer/producer.view.js | 2 +- .../public/js/scalar/scalar.details.js | 6 +- modules/tracker/public/js/trend/trend.view.js | 14 +-- .../visualize/public/js/image/image.index.js | 2 +- .../visualize/public/js/media/media.index.js | 35 ++++--- .../public/js/paraview/paraview.dual.js | 8 +- .../public/js/paraview/paraview.slice.js | 5 +- .../public/js/paraview/paraview.surface.js | 3 +- .../public/js/paraview/paraview.volume.js | 5 +- .../public/js/wrapper/wrapper.index.js | 12 +-- 73 files changed, 646 insertions(+), 685 deletions(-) diff --git a/core/public/js/admin/admin.index.js b/core/public/js/admin/admin.index.js index 4cd222225..0e597ea17 100644 --- a/core/public/js/admin/admin.index.js +++ b/core/public/js/admin/admin.index.js @@ -20,9 +20,9 @@ midas.admin.initModulesConfigLinks = function () { /** On assetstore add response */ midas.admin.assetstoreAddCallback = function (responseText, statusText, xhr, $form) { 'use strict'; - $(".assetstoreLoading").hide(); + $('.assetstoreLoading').hide(); if (responseText.error) { - $(".addAssetstoreFormError").html('Error: ' + responseText.error).show(); + $('.addAssetstoreFormError').html('Error: ' + responseText.error).show(); } else if (responseText.msg) { $(document).trigger('hideCluetip'); @@ -41,25 +41,25 @@ midas.admin.assetstoreSubmit = function (formData, jqForm, options) { // Add the type is the one in the main page (because it's hidden in the assetstore add page) var assetstoretype = {}; assetstoretype.name = 'type'; - assetstoretype.value = $("#importassetstoretype").val(); + assetstoretype.value = $('#importassetstoretype').val(); formData.push(assetstoretype); - $(".assetstoreLoading").show(); - $(".addAssetstoreFormError").html('').hide(); + $('.assetstoreLoading').show(); + $('.addAssetstoreFormError').html('').hide(); }; // end assetstoreBeforeSubmit /** When the cancel is clicked in the new assetstore window */ midas.admin.newAssetstoreShow = function () { 'use strict'; var assetstoretype = $('select#importassetstoretype option:selected').val(); - $('#assetstoretype').find('option:selected').removeAttr("selected"); - $('#assetstoretype').find('option[value=' + assetstoretype + ']').attr("selected", "selected"); + $('#assetstoretype').find('option:selected').removeAttr('selected'); + $('#assetstoretype').find('option[value=' + assetstoretype + ']').attr('selected', 'selected'); }; // end function newAssetstoreShow /** When the cancel is clicked in the new assetstore window */ midas.admin.newAssetstoreHide = function () { 'use strict'; $(document).trigger('hideCluetip'); -}; // end function newAssetstoreHide +}; midas.admin.validateConfig = function (formData, jqForm, options) {}; @@ -70,7 +70,7 @@ midas.admin.successConfig = function (responseText, statusText, xhr, form) { jsonResponse = $.parseJSON(responseText); } catch (e) { - midas.createNotice("An error occured. Please check the logs.", 4000, 'error'); + midas.createNotice('An error occured. Please check the logs.', 4000, 'error'); return false; } if (jsonResponse === null) { @@ -87,15 +87,15 @@ midas.admin.successConfig = function (responseText, statusText, xhr, form) { $(document).ready(function () { 'use strict'; - midas.admin.tabs = $("#tabsGeneric").tabs({}); - $("#tabsGeneric").show(); + midas.admin.tabs = $('#tabsGeneric').tabs({}); + $('#tabsGeneric').show(); $('img.tabsLoading').hide(); $('.defaultAssetstoreLink').click(function () { $.post(json.global.webroot + '/assetstore/defaultassetstore', { - submitDefaultAssetstore: true, - element: $(this).attr('element') - }, + submitDefaultAssetstore: true, + element: $(this).attr('element') + }, function (data) { var jsonResponse = $.parseJSON(data); if (jsonResponse === null) { @@ -126,9 +126,9 @@ $(document).ready(function () { midas.showDialogWithContent('Remove Assetstore', html, false); $('input.deleteAssetstoreYes').unbind('click').click(function () { - $("div.MainDialog").dialog('close'); + $('div.MainDialog').dialog('close'); midas.ajaxSelectRequest = $.ajax({ - type: "POST", + type: 'POST', url: json.global.webroot + '/assetstore/delete', data: { assetstoreId: element @@ -144,7 +144,7 @@ $(document).ready(function () { }); }); $('input.deleteAssetstoreNo').unbind('click').click(function () { - $("div.MainDialog").dialog('close'); + $('div.MainDialog').dialog('close'); }); }); @@ -163,7 +163,7 @@ $(document).ready(function () { $('input#assetstoreSubmit').unbind('click').click(function () { midas.ajaxSelectRequest = $.ajax({ - type: "POST", + type: 'POST', url: json.global.webroot + '/assetstore/edit', data: { assetstoreId: element, @@ -184,7 +184,7 @@ $(document).ready(function () { }); }); $('input.deleteAssetstoreNo').unbind('click').click(function () { - $("div.MainDialog").dialog('close'); + $('div.MainDialog').dialog('close'); }); }); @@ -224,7 +224,7 @@ $(document).ready(function () { modulename: l, modulevalue: modulevalue }); - midas.createNotice("Dependancy: Enabling module " + l, 1500); + midas.createNotice('Dependancy: Enabling module ' + l, 1500); } $('input[module=' + l + ']').attr('checked', true); } @@ -248,7 +248,7 @@ $(document).ready(function () { $.each(moduleDependencies, function (i, l) { if (l != '') { found = true; - midas.createNotice("Dependency: The module " + l + " requires " + mainModule + ". You must disable it first.", 4000, 'warning'); + midas.createNotice('Dependency: The module ' + l + ' requires ' + mainModule + '. You must disable it first.', 4000, 'warning'); } }); if (found) { @@ -258,10 +258,10 @@ $(document).ready(function () { } $.post(json.global.webroot + '/admin/index', { - submitModule: true, - modulename: $(this).attr('module'), - modulevalue: modulevalue - }, + submitModule: true, + modulename: $(this).attr('module'), + modulevalue: modulevalue + }, function (data) { var jsonResponse = $.parseJSON(data); if (jsonResponse === null) { diff --git a/core/public/js/admin/admin.migrate.js b/core/public/js/admin/admin.migrate.js index 1fad6e20e..615a09ef7 100644 --- a/core/public/js/admin/admin.migrate.js +++ b/core/public/js/admin/admin.migrate.js @@ -40,12 +40,12 @@ function startMigrate() { function migrateCallback(responseText, statusText, xhr, form) { 'use strict'; if (responseText.error) { - $(".viewNotice").html(responseText.error); - $(".viewNotice").fadeIn(100).delay(2000).fadeOut(300); + $('.viewNotice').html(responseText.error); + $('.viewNotice').fadeIn(100).delay(2000).fadeOut(300); } else if (responseText.message) { - $(".viewNotice").html(responseText.message); - $(".viewNotice").fadeIn(100).delay(2000).fadeOut(300); + $('.viewNotice').html(responseText.message); + $('.viewNotice').fadeIn(100).delay(2000).fadeOut(300); } } @@ -55,26 +55,26 @@ function assetstoreSubmit(formData, jqForm, options) { // Add the type is the one in the main page (because it's hidden in the assetstore add page) var assetstoretype = {}; assetstoretype.name = 'type'; - assetstoretype.value = $("#importassetstoretype").val(); + assetstoretype.value = $('#importassetstoretype').val(); formData.push(assetstoretype); - $(".assetstoreLoading").show(); + $('.assetstoreLoading').show(); } // end assetstoreBeforeSubmit /** On assetstore add success */ function assetstoreAddCallback(responseText, statusText, xhr, $form) { 'use strict'; - $(".assetstoreLoading").hide(); + $('.assetstoreLoading').hide(); if (responseText.error) { - $(".viewNotice").html(responseText.error); - $(".viewNotice").fadeIn(100).delay(2000).fadeOut(100); + $('.viewNotice').html(responseText.error); + $('.viewNotice').fadeIn(100).delay(2000).fadeOut(100); } else if (responseText.msg) { $(document).trigger('hideCluetip'); // It worked, we add the assetstore to the list and we select it by default if (responseText.assetstore_id) { - $("#assetstore").append($("").attr("value", responseText.assetstore_id).text(responseText.assetstore_name) - .attr("selected", "selected")); + $('#assetstore').append($('').attr('value', responseText.assetstore_id).text(responseText.assetstore_name) + .attr('selected', 'selected')); // Add to JSON var newassetstore = {}; @@ -84,8 +84,8 @@ function assetstoreAddCallback(responseText, statusText, xhr, $form) { assetstores.push(newassetstore); } - $(".viewNotice").html(responseText.msg); - $(".viewNotice").fadeIn(100).delay(2000).fadeOut(100); + $('.viewNotice').html(responseText.msg); + $('.viewNotice').fadeIn(100).delay(2000).fadeOut(100); } } // end assetstoreAddCallback diff --git a/core/public/js/admin/admin.upgrade.js b/core/public/js/admin/admin.upgrade.js index 226d7853f..b765a450a 100644 --- a/core/public/js/admin/admin.upgrade.js +++ b/core/public/js/admin/admin.upgrade.js @@ -9,9 +9,7 @@ $('#upgradeMIDAS').ajaxForm({ success: successUpgrade }); -function validateUpgrade(formData, jqForm, options) { - -} +function validateUpgrade(formData, jqForm, options) {} function successUpgrade(responseText, statusText, xhr, form) { 'use strict'; @@ -19,7 +17,7 @@ function successUpgrade(responseText, statusText, xhr, form) { try { jsonResponse = $.parseJSON(responseText); } catch (e) { - alert("An error occured. Please check the logs."); + alert('An error occured. Please check the logs.'); return false; } if (jsonResponse === null) { diff --git a/core/public/js/apikey/apikey.usertab.js b/core/public/js/apikey/apikey.usertab.js index ede99be6b..662d0e171 100644 --- a/core/public/js/apikey/apikey.usertab.js +++ b/core/public/js/apikey/apikey.usertab.js @@ -14,7 +14,7 @@ midas.apikey.successApiConfig = function (responseText, statusText, xhr, form) { jsonResponse = $.parseJSON(responseText); } catch (e) { - midas.createNotice("An error occured. Please check the logs.", 4000, 'error'); + midas.createNotice('An error occured. Please check the logs.', 4000, 'error'); return false; } if (jsonResponse === null) { @@ -40,10 +40,10 @@ $(document).ready(function () { $('a.deleteApiKeyLink').click(function () { var obj = $(this); $.post(json.global.webroot + '/apikey/usertab', { - deleteAPIKey: true, - element: $(this).attr('element'), - userId: $('#apiUserId').val() - }, + deleteAPIKey: true, + element: $(this).attr('element'), + userId: $('#apiUserId').val() + }, function (data) { var jsonResponse = $.parseJSON(data); if (jsonResponse === null) { diff --git a/core/public/js/browse/browse.index.js b/core/public/js/browse/browse.index.js index 18b4544e0..6e27b42a9 100644 --- a/core/public/js/browse/browse.index.js +++ b/core/public/js/browse/browse.index.js @@ -6,30 +6,30 @@ var midas = midas || {}; $(document).ready( function () { 'use strict'; - $("#browseTable").treeTable(); - $("img.tableLoading").hide(); - $("table#browseTable").show(); + $('#browseTable').treeTable(); + $('img.tableLoading').hide(); + $('table#browseTable').show(); - $('div.feedThumbnail img').fadeTo("slow", 0.4); + $('div.feedThumbnail img').fadeTo('slow', 0.4); $('div.feedThumbnail img').mouseover( function () { - $(this).fadeTo("fast", 1); + $(this).fadeTo('fast', 1); }); $('div.feedThumbnail img').mouseout( function () { - $(this).fadeTo("fast", 0.4); + $(this).fadeTo('fast', 0.4); }); $('a.createCommunity').click( function () { if (json.global.logged) { - midas.loadDialog("createCommunity", "/community/create"); + midas.loadDialog('createCommunity', '/community/create'); midas.showDialog(json.community.createCommunity, false); } else { midas.createNotice(json.community.contentCreateLogin, 4000); - $("div.TopDynamicBar").show('blind'); + $('div.TopDynamicBar').show('blind'); midas.loadAjaxDynamicBar('login', '/user/login'); } }); diff --git a/core/public/js/browse/browse.movecopy.js b/core/public/js/browse/browse.movecopy.js index 9f58c39a3..23d2a5e3b 100644 --- a/core/public/js/browse/browse.movecopy.js +++ b/core/public/js/browse/browse.movecopy.js @@ -19,8 +19,8 @@ midas.browse.moveCopyCallbackSelect = function (node) { parent = null; var classNames = current[0].className.split(' '); for (var key in classNames) { - if (classNames[key].match("child-of-")) { - parent = $("#moveCopyTable #" + classNames[key].substring(9)); + if (classNames[key].match('child-of-')) { + parent = $('#moveCopyTable #' + classNames[key].substring(9)); } } if (parent !== null) { @@ -39,6 +39,7 @@ midas.browse.moveCopyCallbackSelect = function (node) { id: node.attr('element') }; $.post(json.global.webroot + '/browse/getmaxpolicy', params, function (retVal) { + 'use strict'; var resp = $.parseJSON(retVal); node.attr('policy', resp.policy); midas.browse.checkMoveDestinationValid(node, resp.policy); @@ -85,9 +86,9 @@ midas.browse.moveCopyCallbackCustomElements = function (node, elements, first) { var padding = parseInt(node.find('td:first').css('padding-left').slice(0, -2)); var html = ''; $.each(elements.folders, function (index, value) { - html += ""; - html += " " + trimName(value.name, padding) + ""; - html += ""; + html += ''; + html += ' ' + trimName(value.name, padding) + ''; + html += ''; i++; }); return html; @@ -100,15 +101,15 @@ $(document).ready(function () { return true; }); - $("#moveCopyTable").treeTable({ + $('#moveCopyTable').treeTable({ callbackSelect: midas.browse.moveCopyCallbackSelect, callbackCheckboxes: midas.browse.moveCopyCallbackCheckboxes, callbackDblClick: midas.browse.moveCopyCallbackDblClick, callbackCustomElements: midas.browse.moveCopyCallbackCustomElements, pageLength: 99999 // do not page this table (preserves old functionality) }); - $("img.tableLoading").hide(); - $("table#moveCopyTable").show(); + $('img.tableLoading').hide(); + $('table#moveCopyTable').show(); $('.uploadApplet').hide(); @@ -120,7 +121,7 @@ $(document).ready(function () { $('#destinationId').val(destValue); $('.destinationUpload').html(destHtml); $('.destinationId').val(destValue); - $("div.MainDialog").dialog('close'); + $('div.MainDialog').dialog('close'); $('.uploadApplet').show(); return false; }); diff --git a/core/public/js/browse/browse.selectfolder.js b/core/public/js/browse/browse.selectfolder.js index 8a9c04eed..cfbeee58b 100644 --- a/core/public/js/browse/browse.selectfolder.js +++ b/core/public/js/browse/browse.selectfolder.js @@ -26,7 +26,7 @@ midas.browse.selectFolderToggleButton = function (on) { } }; -$("#moveTable").treeTable({ +$('#moveTable').treeTable({ callbackSelect: selectFolderCallbackSelect, callbackDblClick: selectFolderCallbackDblClick, callbackReloadNode: selectFolderCallbackReloadNode, @@ -34,8 +34,8 @@ $("#moveTable").treeTable({ callbackCustomElements: selectFolderCallbackCustomElements, pageLength: 99999 // do not page this table (preserves old functionality) }); -$("div.MainDialogContent img.tableLoading").hide(); -$("table#moveTable").show(); +$('div.MainDialogContent img.tableLoading').hide(); +$('table#moveTable').show(); if ($('div.MainDialogContent #selectElements') !== undefined) { $('div.MainDialogContent #selectElements').click(function () { @@ -51,7 +51,7 @@ if ($('div.MainDialogContent #selectElements') !== undefined) { $('#destinationId').val(folderId); $('.destinationUpload').html(folderName); $('.destinationId').val(folderId); - $("div.MainDialog").dialog('close'); + $('div.MainDialog').dialog('close'); if (typeof folderSelectionCallback == 'function') { folderSelectionCallback(folderName, folderId); @@ -73,8 +73,8 @@ function selectFolderCallbackSelect(node) { parent = null; var classNames = current[0].className.split(' '); for (var key in classNames) { - if (classNames[key].match("child-of-")) { - parent = $("div.MainDialogContent #" + classNames[key].substring(9)); + if (classNames[key].match('child-of-')) { + parent = $('div.MainDialogContent #' + classNames[key].substring(9)); } } if (parent !== null) { @@ -170,9 +170,9 @@ function selectFolderCallbackCustomElements(node, elements) { var padding = parseInt(node.find('td:first').css('padding-left').slice(0, -2)); var html = ''; $.each(elements.folders, function (index, value) { - html += ""; - html += " " + trimName(value.name, padding) + ""; - html += ""; + html += ''; + html += ' ' + trimName(value.name, padding) + ''; + html += ''; i++; }); return html; diff --git a/core/public/js/browse/browse.selectitem.js b/core/public/js/browse/browse.selectitem.js index 407b5e815..40c75fc73 100644 --- a/core/public/js/browse/browse.selectitem.js +++ b/core/public/js/browse/browse.selectitem.js @@ -4,11 +4,11 @@ /* global sliceFileName */ /* global trimName */ -$("#moveTable").treeTable({ +$('#moveTable').treeTable({ pageLength: 99999 }); -$("img.tableLoading").hide(); -$("table#moveTable").show(); +$('img.tableLoading').hide(); +$('table#moveTable').show(); $('.uploadApplet').hide(); @@ -19,7 +19,7 @@ if ($('#selectElements') !== undefined) { $('#destinationId').val($('#selectedDestinationHidden').val()); $('.destinationUpload').html($('#selectedDestination').html()); $('.destinationId').val($('#selectedDestinationHidden').val()); - $("div.MainDialog").dialog('close'); + $('div.MainDialog').dialog('close'); $('.uploadApplet').show(); if (typeof itemSelectionCallback == 'function') { @@ -66,17 +66,17 @@ function callbackCustomElements(node, elements, first) { var html = ''; $.each(elements['folders'], function (index, value) { - html += ""; - html += " " + trimName(value['name'], padding) + ""; - html += ""; + html += ''; + html += ' ' + trimName(value['name'], padding) + ''; + html += ''; i++; }); $.each(elements['items'], function (index, value) { - html += ""; - html += " " + trimName(value['name'], padding) + ""; - html += ""; + html += ''; + html += ' ' + trimName(value['name'], padding) + ''; + html += ''; i++; }); return html; @@ -84,14 +84,14 @@ function callbackCustomElements(node, elements, first) { } // Live search -$.widget("custom.catcomplete", $.ui.autocomplete, { +$.widget('custom.catcomplete', $.ui.autocomplete, { _renderMenu: function (ul, items) { 'use strict'; var self = this, - currentCategory = ""; + currentCategory = ''; $.each(items, function (index, item) { if (item.category != currentCategory) { - ul.append('
  • ' + item.category + "
  • "); + ul.append('
  • ' + item.category + '
  • '); currentCategory = item.category; } self._renderItemData(ul, item); @@ -101,7 +101,7 @@ $.widget("custom.catcomplete", $.ui.autocomplete, { var cacheSearchSelectItem = {}, lastXhr; -$("#live_search_item").catcomplete({ +$('#live_search_item').catcomplete({ minLength: 2, delay: 10, source: function (request, response) { @@ -112,10 +112,10 @@ $("#live_search_item").catcomplete({ return; } - $("#searchloadingSelectItem").show(); + $('#searchloadingSelectItem').show(); - lastXhr = $.getJSON($('.webroot').val() + "/search/live?itemSearch=true", request, function (data, status, xhr) { - $("#searchloadingSelectItem").hide(); + lastXhr = $.getJSON($('.webroot').val() + '/search/live?itemSearch=true', request, function (data, status, xhr) { + $('#searchloadingSelectItem').hide(); cacheSearchSelectItem[term] = data; if (xhr === lastXhr) { itemselected = false; diff --git a/core/public/js/common/common.browser.js b/core/public/js/common/common.browser.js index f11e203da..0feb58383 100644 --- a/core/public/js/common/common.browser.js +++ b/core/public/js/common/common.browser.js @@ -27,7 +27,7 @@ midas.genericCallbackSelect = function (node) { midas.createAction(node); midas.ajaxSelectRequest = $.ajax({ - type: "POST", + type: 'POST', url: json.global.webroot + '/browse/getelementinfo', data: { type: node.attr('type'), @@ -47,7 +47,7 @@ midas.genericCallbackCheckboxes = function (node) { arraySelected['items'] = []; var folders = ''; var items = ''; - node.find(".treeCheckbox:checked").each( + node.find('.treeCheckbox:checked').each( function () { if ($(this).parents('tr').attr('type') != 'item') { arraySelected['folders'].push($(this).attr('element')); @@ -78,16 +78,16 @@ midas.genericCallbackCheckboxes = function (node) { if (json.global.logged) { links += '
  • '; links += ' '; - links += ' ' + json.browse.deleteSelected + '
  • '; + links += ' ' + json.browse.deleteSelected + ''; links += ''; links += '
  • '; links += ' '; - links += 'Move all selected'; + links += 'Move all selected'; links += '
  • '; if (arraySelected['items'].length > 0) { links += '
  • '; links += ' '; - links += ' ' + json.browse.duplicateSelected + '
  • '; + links += ' ' + json.browse.duplicateSelected + ''; links += ''; } if (arraySelected['items'].length > 1 && arraySelected['folders'].length === 0) { @@ -199,7 +199,7 @@ midas.removeNodeFromTree = function (node, recursive) { for (var curNode in ancestorNodes) { var jCurNode = $(ancestorNodes[curNode]); jCurNode.find('span.elementCount').remove(); - jCurNode.find('span.elementSize').after(""); + jCurNode.find('span.elementSize').after(''); jCurNode.find('span.elementSize').remove(); } // update folder size @@ -232,9 +232,9 @@ midas.removeItem = function (id) { } $.post(json.global.webroot + '/folder/removeitem', { - folderId: folderId, - itemId: id - }, + folderId: folderId, + itemId: id + }, function (data) { var jsonResponse = $.parseJSON(data); if (!jsonResponse) { @@ -332,7 +332,7 @@ midas.deleteSelected = function (folders, items) { */ midas.duplicateSelected = function (folders, items) { 'use strict'; - midas.loadDialog("duplicateItem", "/browse/movecopy/?duplicate=true&items=" + encodeURIComponent(items)); + midas.loadDialog('duplicateItem', '/browse/movecopy/?duplicate=true&items=' + encodeURIComponent(items)); var title = 'Copy selected items'; if (folders != '') { title += ' ' + json.browse.ignoreSelectedFolders; @@ -345,7 +345,7 @@ midas.duplicateSelected = function (folders, items) { */ midas.duplicateItem = function (item) { 'use strict'; - midas.loadDialog("duplicateItem", "/browse/movecopy/?duplicate=true&items=" + encodeURIComponent(item)); + midas.loadDialog('duplicateItem', '/browse/movecopy/?duplicate=true&items=' + encodeURIComponent(item)); midas.showDialog('Copy item'); }; @@ -356,7 +356,7 @@ midas.duplicateItem = function (item) { */ midas.moveSelected = function (folders, items) { 'use strict'; - midas.loadDialog("moveItem", "/browse/movecopy/?move=true&items=" + encodeURIComponent(items) + "&folders=" + encodeURIComponent(folders)); + midas.loadDialog('moveItem', '/browse/movecopy/?move=true&items=' + encodeURIComponent(items) + '&folders=' + encodeURIComponent(folders)); midas.showDialog('Move all selected resources'); }; @@ -368,7 +368,7 @@ midas.removeChildren = function (node) { 'use strict'; node.each( function () { - var children = $("table.treeTable tbody tr.child-of-" + this.id); + var children = $('table.treeTable tbody tr.child-of-' + this.id); $(children).each( function () { midas.removeChildren($(this)); @@ -379,19 +379,19 @@ midas.removeChildren = function (node) { midas.editFolder = function (id) { 'use strict'; - midas.loadDialog("editFolder" + id, "/folder/edit?folderId=" + encodeURIComponent(id)); + midas.loadDialog('editFolder' + id, '/folder/edit?folderId=' + encodeURIComponent(id)); midas.showDialog(json.browse.edit, false); }; midas.moveFolder = function (id) { 'use strict'; - midas.loadDialog("moveFolder" + id, "/browse/movecopy?move=true&folders=" + encodeURIComponent(id)); + midas.loadDialog('moveFolder' + id, '/browse/movecopy?move=true&folders=' + encodeURIComponent(id)); midas.showDialog(json.browse.move); }; midas.moveItem = function (itemId, fromFolderId) { 'use strict'; - midas.loadDialog("moveItem" + itemId, "/browse/movecopy?move=true&items=" + encodeURIComponent(itemId) + "&from=" + encodeURIComponent(fromFolderId)); + midas.loadDialog('moveItem' + itemId, '/browse/movecopy?move=true&items=' + encodeURIComponent(itemId) + '&from=' + encodeURIComponent(fromFolderId)); midas.showDialog(json.browse.move); }; @@ -400,8 +400,8 @@ midas.parentOf = function (node) { var classNames = node[0].className.split(' '); for (var key in classNames) { - if (classNames[key].match("child-of-")) { - return $("#" + classNames[key].substring(9)); + if (classNames[key].match('child-of-')) { + return $('#' + classNames[key].substring(9)); } } }; @@ -469,11 +469,11 @@ midas.createAction = function (node) { html += '
  • ' + json.browse.download + '
  • '; html += '
  • Share
  • '; if (json.global.logged) { - html += '
  • Copy
  • '; + html += '
  • Copy
  • '; } if (policy >= 2) { html += '
  • '; - html += '
  • ' + json.browse.move + '
  • '; + html += '
  • ' + json.browse.move + '
  • '; html += '
  • ' + json.browse['removeItem'] + '
  • '; } } @@ -500,11 +500,11 @@ midas.createAction = function (node) { button.click(); }); $('a.sharingLink').click(function () { - midas.loadDialog("sharing" + $(this).attr('type') + $(this).attr('element'), "/share/dialog?type=" + encodeURIComponent($(this).attr('type')) + '&element=' + encodeURIComponent($(this).attr('element'))); + midas.loadDialog('sharing' + $(this).attr('type') + $(this).attr('element'), '/share/dialog?type=' + encodeURIComponent($(this).attr('type')) + '&element=' + encodeURIComponent($(this).attr('element'))); midas.showDialog(json.browse.share); }); $('a.getResourceLinks').click(function () { - midas.loadDialog("links" + $(this).attr('type') + $(this).attr('element'), '/share/links?type=' + encodeURIComponent($(this).attr('type')) + '&id=' + encodeURIComponent($(this).attr('element'))); + midas.loadDialog('links' + $(this).attr('type') + $(this).attr('element'), '/share/links?type=' + encodeURIComponent($(this).attr('type')) + '&id=' + encodeURIComponent($(this).attr('element'))); midas.showDialog('Link to this item'); }); $('a.downloadFolderLink').click(function () { @@ -548,7 +548,7 @@ midas.createAction = function (node) { midas.escape = function (text) { 'use strict'; - return $('
    ').text(text).html() + return $('
    ').text(text).html(); }; midas.createInfo = function (jsonContent) { @@ -643,7 +643,7 @@ midas.browser.enableSelectAll = function (opts) { $('#browseTableHeaderCheckbox').click( function () { var selector = this.checked ? '.treeCheckbox:visible' : '.treeCheckbox'; - $('#browseTable').find(selector).prop("checked", this.checked); + $('#browseTable').find(selector).prop('checked', this.checked); options.callback($('#browseTable')); }); }; diff --git a/core/public/js/common/common.feed.js b/core/public/js/common/common.feed.js index b58bf4cbb..97135f682 100644 --- a/core/public/js/common/common.feed.js +++ b/core/public/js/common/common.feed.js @@ -25,14 +25,14 @@ $(document).ready(function () { $('input.deleteFeedYes').unbind('click').click(function () { var elementId = $(this).attr('element'); $.post(json.global.webroot + '/feed/deleteajax', { - feed: $(this).attr('element') - }, + feed: $(this).attr('element') + }, function (data) {}); $('div.feedElement[element=' + elementId + ']').remove(); - $("div.MainDialog").dialog('close'); + $('div.MainDialog').dialog('close'); }); $('input.deleteFeedNo').unbind('click').click(function () { - $("div.MainDialog").dialog('close'); + $('div.MainDialog').dialog('close'); }); }); }); diff --git a/core/public/js/community/community.create.js b/core/public/js/community/community.create.js index 6b26a1c43..7c0bf0b42 100644 --- a/core/public/js/community/community.create.js +++ b/core/public/js/community/community.create.js @@ -10,10 +10,10 @@ $('form.createCommunityForm').submit(function () { $('div.createNameElement input').focusout(function () { 'use strict'; - $.post($('.webroot').val() + "/community/validentry", { - entry: $('input[name=name]').val(), - type: "dbcommunityname" - }, + $.post($('.webroot').val() + '/community/validentry', { + entry: $('input[name=name]').val(), + type: 'dbcommunityname' + }, function (data) { if (data.search('true') != -1) { midas.createNotice('Name already exists', 4000); diff --git a/core/public/js/community/community.index.js b/core/public/js/community/community.index.js index b4a3f605c..125481c02 100644 --- a/core/public/js/community/community.index.js +++ b/core/public/js/community/community.index.js @@ -8,12 +8,12 @@ $(document).ready(function () { 'use strict'; $('a.createCommunity').click(function () { if (json.global.logged) { - midas.loadDialog("createCommunity", "/community/create"); + midas.loadDialog('createCommunity', '/community/create'); midas.showDialog(json.community.createCommunity, false); } else { midas.createNotice(json.community.contentCreateLogin, 4000); - $("div.TopDynamicBar").show('blind'); + $('div.TopDynamicBar').show('blind'); midas.loadAjaxDynamicBar('login', '/user/login'); } }); diff --git a/core/public/js/community/community.invitation.js b/core/public/js/community/community.invitation.js index 340f37da9..c33a194d8 100644 --- a/core/public/js/community/community.invitation.js +++ b/core/public/js/community/community.invitation.js @@ -5,7 +5,7 @@ var midas = midas || {}; midas.invite = midas.invite || {}; -midas.invite.directAdd = $("#directAdd").val(); +midas.invite.directAdd = $('#directAdd').val(); /** * Render group selection dialog for the community @@ -34,14 +34,14 @@ midas.invite.showGroupSelect = function (item) { }; // Live search -$.widget("custom.catcomplete", $.ui.autocomplete, { +$.widget('custom.catcomplete', $.ui.autocomplete, { _renderMenu: function (ul, items) { 'use strict'; var self = this, - currentCategory = ""; + currentCategory = ''; $.each(items, function (index, item) { if (item.category != currentCategory) { - ul.append('
  • ' + item.category + "
  • "); + ul.append('
  • ' + item.category + '
  • '); currentCategory = item.category; } self._renderItemData(ul, item); @@ -52,7 +52,7 @@ $.widget("custom.catcomplete", $.ui.autocomplete, { var invitationSearchcache = {}, lastShareXhr; -$("#live_invitation_search").catcomplete({ +$('#live_invitation_search').catcomplete({ minLength: 2, delay: 10, source: function (request, response) { @@ -62,11 +62,11 @@ $("#live_invitation_search").catcomplete({ response(invitationSearchcache[term]); return; } - $("#searchInvitationLoading").show(); + $('#searchInvitationLoading').show(); - lastShareXhr = $.getJSON($('.webroot').val() + "/search/live?userSearch=true&allowEmail", + lastShareXhr = $.getJSON($('.webroot').val() + '/search/live?userSearch=true&allowEmail', request, function (data, status, xhr) { - $("#searchInvitationLoading").hide(); + $('#searchInvitationLoading').hide(); invitationSearchcache[term] = data; if (xhr === lastShareXhr) { response(data); diff --git a/core/public/js/community/community.manage.js b/core/public/js/community/community.manage.js index a4088d949..b95f60b2c 100644 --- a/core/public/js/community/community.manage.js +++ b/core/public/js/community/community.manage.js @@ -25,7 +25,7 @@ midas.community.manage.init = function () { }); $('a#addUserToGroupLink').click(function () { - midas.loadDialog("invitationCommunity", "/community/invitation?directadd=true&communityId=" + encodeURIComponent(json.community.community_id)); + midas.loadDialog('invitationCommunity', '/community/invitation?directadd=true&communityId=' + encodeURIComponent(json.community.community_id)); midas.showDialog(json.community.sendInvitation, false); }); @@ -51,8 +51,8 @@ midas.community.manage.init = function () { disableElementSize: true }); - $("img.tableLoading").hide(); - $("table#browseTable").show(); + $('img.tableLoading').hide(); + $('table#browseTable').show(); $('div.userPersonalData').hide(); @@ -100,10 +100,10 @@ $('a.deleteGroupLink').click(function () { $('input.deleteGroupYes').unbind('click').click(function () { var groupid = $(this).attr('element'); $.post(json.global.webroot + '/community/manage', { - communityId: json.community.community_id, - deleteGroup: 'true', - groupId: groupid - }, + communityId: json.community.community_id, + deleteGroup: 'true', + groupId: groupid + }, function (data) { var jsonResponse = $.parseJSON(data); if (jsonResponse === null) { @@ -111,7 +111,7 @@ $('a.deleteGroupLink').click(function () { return; } if (jsonResponse[0]) { - $("div.MainDialog").dialog("close"); + $('div.MainDialog').dialog('close'); $('a.groupLink[groupid=' + groupid + ']').parent('li').remove(); midas.createNotice(jsonResponse[1], 4000); midas.community.manage.init(); @@ -125,44 +125,44 @@ $('a.deleteGroupLink').click(function () { ); }); $('input.deleteGroupNo').unbind('click').click(function () { - $("div.MainDialog").dialog('close'); + $('div.MainDialog').dialog('close'); }); }); midas.community.manage.initDragAndDrop = function () { 'use strict'; - $("#browseTable .file, #browseTable .filePublic, #browseTable .filePrivate," + - "#browseTable .folderPublic:not(.notdraggable), #browseTable .folderPrivate:not(.notdraggable)").draggable({ - helper: "clone", - cursor: "move", - opacity: 0.75, - refreshPositions: true, // Performance? - revert: "invalid", - revertDuration: 300, - scroll: true, - start: function () { - $('div.userPersonalData').show(); - } - }); + $('#browseTable .file, #browseTable .filePublic, #browseTable .filePrivate,' + + '#browseTable .folderPublic:not(.notdraggable), #browseTable .folderPrivate:not(.notdraggable)').draggable({ + helper: 'clone', + cursor: 'move', + opacity: 0.75, + refreshPositions: true, // Performance? + revert: 'invalid', + revertDuration: 300, + scroll: true, + start: function () { + $('div.userPersonalData').show(); + } + }); // Configure droppable rows - $("#browseTable .folder, #browseTable .folderPublic, #browseTable .folderPrivate").each(function () { - $(this).parents("tr").droppable({ - accept: ".file, .filePublic, .filePrivate, .folder, .folderPublic, .folderPrivate", + $('#browseTable .folder, #browseTable .folderPublic, #browseTable .folderPrivate').each(function () { + $(this).parents('tr').droppable({ + accept: '.file, .filePublic, .filePrivate, .folder, .folderPublic, .folderPrivate', drop: function (e, ui) { // Call jQuery treeTable plugin to move the branch var elements = ''; - if ($(ui.draggable).parents("tr").attr('type') == 'folder') { - elements = $(ui.draggable).parents("tr").attr('element') + ';'; + if ($(ui.draggable).parents('tr').attr('type') == 'folder') { + elements = $(ui.draggable).parents('tr').attr('element') + ';'; } else { - elements = ';' + $(ui.draggable).parents("tr").attr('element'); + elements = ';' + $(ui.draggable).parents('tr').attr('element'); } var from_obj; - var classNames = $(ui.draggable).parents("tr").attr('class').split(' '); + var classNames = $(ui.draggable).parents('tr').attr('class').split(' '); for (var key in classNames) { if (classNames[key].match('child-of-')) { - from_obj = "#" + classNames[key].substring(9); + from_obj = '#' + classNames[key].substring(9); } } var destination_obj = this; @@ -170,12 +170,12 @@ midas.community.manage.initDragAndDrop = function () { // do nothing if drop item(s) to its current folder if ($(this).attr('id') != $(from_obj).attr('id')) { $.post(json.global.webroot + '/browse/movecopy', { - moveElement: true, - elements: elements, - destination: $(this).attr('element'), - from: $(from_obj).attr('element'), - ajax: true - }, + moveElement: true, + elements: elements, + destination: $(this).attr('element'), + from: $(from_obj).attr('element'), + ajax: true + }, function (data) { var jsonResponse = $.parseJSON(data); if (jsonResponse === null) { @@ -184,7 +184,7 @@ midas.community.manage.initDragAndDrop = function () { } if (jsonResponse[0]) { midas.createNotice(jsonResponse[1], 1500); - $($(ui.draggable).parents("tr")).appendBranchTo(destination_obj); + $($(ui.draggable).parents('tr')).appendBranchTo(destination_obj); } else { midas.createNotice(jsonResponse[1], 4000, 'error'); @@ -193,10 +193,10 @@ midas.community.manage.initDragAndDrop = function () { ); } }, - hoverClass: "accept", + hoverClass: 'accept', over: function (e, ui) { // Make the droppable branch expand when a draggable node is moved over it. - if (this.id != $(ui.draggable.parents("tr")[0]).id && !$(this).is(".expanded")) { + if (this.id != $(ui.draggable.parents('tr')[0]).id && !$(this).is('.expanded')) { $(this).expand(); } } @@ -215,7 +215,7 @@ midas.community.manage.validateGroupChange = function (formData, jqForm, options midas.community.manage.successGroupChange = function (responseText, statusText, xhr, form) { 'use strict'; - $("div.MainDialog").dialog("close"); + $('div.MainDialog').dialog('close'); var jsonResponse = $.parseJSON(responseText); if (jsonResponse === null) { midas.createNotice('Error', 4000, 'error'); @@ -289,9 +289,9 @@ midas.community.manage.promoteMember = function (userId) { midas.community.manage.removeFromGroup = function (userId, groupId) { 'use strict'; $.post(json.global.webroot + '/community/removeuserfromgroup', { - groupId: groupId, - userId: userId - }, + groupId: groupId, + userId: userId + }, function (data) { var jsonResponse = $.parseJSON(data); if (jsonResponse === null) { @@ -355,7 +355,7 @@ $(document).ready(function () { 'use strict'; midas.community.manage.initCommunityPrivacy(); - $("#tabsGeneric").tabs({ + $('#tabsGeneric').tabs({ select: function (event, ui) { $('div.genericAction').show(); $('div.genericCommunities').show(); @@ -367,7 +367,7 @@ $(document).ready(function () { $('td.tdUser input').removeAttr('checked'); } }); - $("#tabsGeneric").show(); + $('#tabsGeneric').show(); $('img.tabsLoading').hide(); $('a#communityDeleteLink').click(function () { @@ -385,7 +385,7 @@ $(document).ready(function () { location.replace(json.global.webroot + '/community/delete?communityId=' + encodeURIComponent(json.community.community_id)); }); $('input.deleteCommunityNo').unbind('click').click(function () { - $("div.MainDialog").dialog('close'); + $('div.MainDialog').dialog('close'); }); }); @@ -415,8 +415,8 @@ $(document).ready(function () { $('table').filter(function () { return this.id.match(/browseTable*/); }).treeTable(); - $("img.tableLoading").hide(); - $("table#browseTable").show(); + $('img.tableLoading').hide(); + $('table#browseTable').show(); $('div.userPersonalData').hide(); midas.community.manage.initDragAndDrop(); diff --git a/core/public/js/community/community.selectgroup.js b/core/public/js/community/community.selectgroup.js index 6eea87d68..1de5a1890 100644 --- a/core/public/js/community/community.selectgroup.js +++ b/core/public/js/community/community.selectgroup.js @@ -18,15 +18,15 @@ $(document).ready(function () { else { params[midas.invite.item.key] = midas.invite.item.value; } - if (typeof midas.invite.directAdd !== "undefined" && midas.invite.directAdd == 1) { - url = json.global.webroot + '/community/addusertogroup' + if (typeof midas.invite.directAdd !== 'undefined' && midas.invite.directAdd == 1) { + url = json.global.webroot + '/community/addusertogroup'; } $.post(json.global.webroot + '/community/sendinvitation', params, function (data) { var jsonResponse = $.parseJSON(data); if (jsonResponse[0]) { midas.createNotice(jsonResponse[1], 3000); - if (typeof midas.invite.directAdd !== "undefined" && midas.invite.directAdd == 1) { - window.location.href = json.global.webroot + "/community/manage?communityId=" + encodeURIComponent(json.community.community_id) + "#tabs-Users"; + if (typeof midas.invite.directAdd !== 'undefined' && midas.invite.directAdd == 1) { + window.location.href = json.global.webroot + '/community/manage?communityId=' + encodeURIComponent(json.community.community_id) + '#tabs-Users'; window.location.reload(); } $('div.MainDialog').dialog('close'); diff --git a/core/public/js/community/community.view.js b/core/public/js/community/community.view.js index cf7a5a20d..9265cd93b 100644 --- a/core/public/js/community/community.view.js +++ b/core/public/js/community/community.view.js @@ -6,7 +6,7 @@ var midas = midas || {}; $(document).ready(function () { 'use strict'; - $("#tabsGeneric").tabs({ + $('#tabsGeneric').tabs({ select: function (event, ui) { $('div.genericAction').show(); $('div.genericCommunities').show(); @@ -15,10 +15,10 @@ $(document).ready(function () { $('div.viewAction').hide(); } }); - $("#tabsGeneric").show(); + $('#tabsGeneric').show(); $('img.tabsLoading').hide(); - $("#browseTable").treeTable({ + $('#browseTable').treeTable({ onFirstInit: midas.enableRangeSelect, onNodeShow: midas.enableRangeSelect, onNodeHide: midas.enableRangeSelect @@ -27,11 +27,11 @@ $(document).ready(function () { midas.browser.enableSelectAll(); - $("img.tableLoading").hide(); - $("table#browseTable").show(); + $('img.tableLoading').hide(); + $('table#browseTable').show(); $('a#sendInvitationLink').click(function () { - midas.loadDialog("invitationCommunity", "/community/invitation?communityId=" + encodeURIComponent(json.community.community_id)); + midas.loadDialog('invitationCommunity', '/community/invitation?communityId=' + encodeURIComponent(json.community.community_id)); midas.showDialog(json.community.sendInvitation, false); }); diff --git a/core/public/js/element/serversidefilechooser.js b/core/public/js/element/serversidefilechooser.js index e9d55ea56..83c009729 100644 --- a/core/public/js/element/serversidefilechooser.js +++ b/core/public/js/element/serversidefilechooser.js @@ -2,31 +2,31 @@ $(document).ready(function () { 'use strict'; - var id = $("input#serversidefilechooser-id").val(); - var errorMessage = $("input#serversidefilechooser-errorMessage").val(); - var destSelector = $("input#serversidefilechooser-destSelector").val(); - var fileFilter = $("input#serversidefilechooser-fileFilter").val(); - var scriptaction = $("input#serversidefilechooser-script").val(); + var id = $('input#serversidefilechooser-id').val(); + var errorMessage = $('input#serversidefilechooser-errorMessage').val(); + var destSelector = $('input#serversidefilechooser-destSelector').val(); + var fileFilter = $('input#serversidefilechooser-fileFilter').val(); + var scriptaction = $('input#serversidefilechooser-script').val(); // Cancel button: hide - $("#fp-" + id + "-inputButtonCancel").click(function () { - $("#fp-" + id + "-panel, #fp-" + id + "-background").fadeOut(300); + $('#fp-' + id + '-inputButtonCancel').click(function () { + $('#fp-' + id + '-panel, #fp-' + id + '-background').fadeOut(300); return false; }); // Open button: show - $("#" + id).click(function () { + $('#' + id).click(function () { //$('
    ').addClass('lightbox_bg').appendTo('body').show(); $('.TopDynamicBar').after('
    '); - $("#fp-" + id + "-panel, #fp-" + id + "-background").fadeIn(300); + $('#fp-' + id + '-panel, #fp-' + id + '-background').fadeIn(300); return false; }); $('#fp-' + id + '-fileTree').fileTree({ - root: '', - script: scriptaction - }, + root: '', + script: scriptaction + }, function (file) { - $("#fp-" + id + "-inputFile").val('' + file); + $('#fp-' + id + '-inputFile').val('' + file); }, function (dir) { // Some checks if the root starts with // @@ -34,21 +34,21 @@ $(document).ready(function () { dir = dir.substr(1); } - $("#fp-" + id + "-inputFile").val('' + dir); + $('#fp-' + id + '-inputFile').val('' + dir); } ); // Validate button - $("#fp-" + id + "-inputButtonOK").click(function () { + $('#fp-' + id + '-inputButtonOK').click(function () { // extract file name - var file = $("#fp-" + id + "-inputFile").val(); + var file = $('#fp-' + id + '-inputFile').val(); var re = new RegExp(fileFilter); if (file.match(re)) { // if destSelector is valid set its value to file if ($(destSelector).length !== 0) { $(destSelector).val(file); $(destSelector).change(); // mark that it has changed - $("#fp-" + id + "-panel, #fp-" + id + "-background").fadeOut(300); + $('#fp-' + id + '-panel, #fp-' + id + '-background').fadeOut(300); } } else if (errorMessage) { diff --git a/core/public/js/feed/feed.index.js b/core/public/js/feed/feed.index.js index 7b60d116c..163686615 100644 --- a/core/public/js/feed/feed.index.js +++ b/core/public/js/feed/feed.index.js @@ -2,13 +2,13 @@ $(document).ready(function () { 'use strict'; - $('div.feedThumbnail img').fadeTo("slow", 0.4); + $('div.feedThumbnail img').fadeTo('slow', 0.4); $('div.feedThumbnail img').mouseover(function () { - $(this).fadeTo("fast", 1); + $(this).fadeTo('fast', 1); }); $('div.feedThumbnail img').mouseout(function () { - $(this).fadeTo("fast", 0.4); + $(this).fadeTo('fast', 0.4); }); }); diff --git a/core/public/js/folder/folder.createfolder.js b/core/public/js/folder/folder.createfolder.js index 116ea1bbb..219df6e7c 100644 --- a/core/public/js/folder/folder.createfolder.js +++ b/core/public/js/folder/folder.createfolder.js @@ -15,7 +15,7 @@ if (typeof callbackDblClick != 'function') { if (node[0] === undefined) { return null; } - return $("table.treeTable tbody tr.child-of-" + node[0].id); + return $('table.treeTable tbody tr.child-of-' + node[0].id); } } @@ -34,7 +34,7 @@ function successCreateFolder(responseText, statusText, xhr, form) { successCreateFolderCallback(responseText, statusText, xhr, form); return; } - $("div.MainDialog").dialog("close"); + $('div.MainDialog').dialog('close'); var jsonResponse = $.parseJSON(responseText); if (jsonResponse === null) { midas.createNotice('Error', 4000); @@ -49,8 +49,8 @@ function successCreateFolder(responseText, statusText, xhr, form) { // The new folder is a top level folder else { var newNodeId = ''; - if ($("#browseTable > tbody > tr:last").length > 0) { - var lastTopLevelNodeId = $("#browseTable > tbody > tr:last").attr("id").split("-")[2]; + if ($('#browseTable > tbody > tr:last').length > 0) { + var lastTopLevelNodeId = $('#browseTable > tbody > tr:last').attr('id').split('-')[2]; newNodeId = parseInt(eval(lastTopLevelNodeId) + 1); } else { @@ -59,20 +59,20 @@ function successCreateFolder(responseText, statusText, xhr, form) { var newRow = ''; // policy: 2 <=> MIDAS_POLICY_ADMIN - newRow += ""; - newRow += " " + jsonResponse[3].name + ""; - newRow += " "; - newRow += " " + jsonResponse[4] + ""; - newRow += " "; - newRow += ""; + newRow += ''; + newRow += ' ' + jsonResponse[3].name + ''; + newRow += ' '; + newRow += ' ' + jsonResponse[4] + ''; + newRow += ' '; + newRow += ''; - if ($("#browseTable > tbody > tr:last").length > 0) { - $(newRow).insertAfter("#browseTable > tbody > tr:last"); + if ($('#browseTable > tbody > tr:last').length > 0) { + $(newRow).insertAfter('#browseTable > tbody > tr:last'); } else { - $(newRow).appendTo("#browseTable > tbody"); + $(newRow).appendTo('#browseTable > tbody'); } - $("#browseTable").treeTable({ + $('#browseTable').treeTable({ onFirstInit: midas.enableRangeSelect, onNodeShow: midas.enableRangeSelect, onNodeHide: midas.enableRangeSelect diff --git a/core/public/js/folder/folder.view.js b/core/public/js/folder/folder.view.js index 75fd1dd7f..27a36d5fe 100644 --- a/core/public/js/folder/folder.view.js +++ b/core/public/js/folder/folder.view.js @@ -6,7 +6,7 @@ var midas = midas || {}; $(document).ready(function () { 'use strict'; - $("#browseTable").treeTable({ + $('#browseTable').treeTable({ onFirstInit: midas.enableRangeSelect, onNodeShow: midas.enableRangeSelect, onNodeHide: midas.enableRangeSelect @@ -23,11 +23,11 @@ $(document).ready(function () { }); $('a.sharingLink').click(function () { - midas.loadDialog("sharing" + $(this).attr('type') + $(this).attr('element'), "/share/dialog?type=" + encodeURIComponent($(this).attr('type')) + '&element=' + encodeURIComponent($(this).attr('element'))); + midas.loadDialog('sharing' + $(this).attr('type') + $(this).attr('element'), '/share/dialog?type=' + encodeURIComponent($(this).attr('type')) + '&element=' + encodeURIComponent($(this).attr('element'))); midas.showDialog(json.browse.share); }); $('a.getResourceLinks').click(function () { - midas.loadDialog("links" + $(this).attr('type') + $(this).attr('element'), '/share/links?type=' + encodeURIComponent($(this).attr('type')) + '&id=' + encodeURIComponent($(this).attr('element'))); + midas.loadDialog('links' + $(this).attr('type') + $(this).attr('element'), '/share/links?type=' + encodeURIComponent($(this).attr('type')) + '&id=' + encodeURIComponent($(this).attr('element'))); midas.showDialog('Link to this item'); }); $('a.uploadInFolder').click(function () { @@ -61,11 +61,11 @@ $(document).ready(function () { */ midas.browser.enableSelectAll(); - $("img.tableLoading").hide(); - $("table#browseTable").show(); + $('img.tableLoading').hide(); + $('table#browseTable').show(); - $("#tabsGeneric").tabs(); - $("#tabsGeneric").show(); + $('#tabsGeneric').tabs(); + $('#tabsGeneric').show(); if ($('.pathBrowser li').length > 5) { while ($('.pathBrowser li').length > 5) { diff --git a/core/public/js/import/import.index.js b/core/public/js/import/import.index.js index 25a53215e..2ae332e12 100644 --- a/core/public/js/import/import.index.js +++ b/core/public/js/import/import.index.js @@ -46,11 +46,11 @@ midas.import.importCallback = function (responseText, statusText, xhr, form) { 'use strict'; if (responseText.stage === 'validate') { midas.import.stage = 'initialize'; - $("#progress_status").html('Counting files (this could take some time)'); + $('#progress_status').html('Counting files (this could take some time)'); midas.import.formSubmitOptions.data = { initialize: '1' }; - $("#importsubmit").html($("#importstop").val()); + $('#importsubmit').html($('#importstop').val()); $('#importForm').ajaxSubmit(midas.import.formSubmitOptions); } else if (responseText.stage === 'initialize') { @@ -62,16 +62,16 @@ midas.import.importCallback = function (responseText, statusText, xhr, form) { } else if (responseText.error) { midas.import.stage = 'validate'; // goes back to the validate stage - $("#importsubmit").html(midas.import.importSubmitButtonValue); - $(".viewNotice").html(responseText.error); - $(".viewNotice").fadeIn(100).delay(2000).fadeOut(300); + $('#importsubmit').html(midas.import.importSubmitButtonValue); + $('.viewNotice').html(responseText.error); + $('.viewNotice').fadeIn(100).delay(2000).fadeOut(300); } else if (responseText.message) { midas.import.stage = 'validate'; // goes back to the validate stage - $("#progress_status").html('Import done'); - $("#progress").progressbar("value", 100); - $(".viewNotice").html(responseText.message); - $(".viewNotice").fadeIn(100).delay(2000).fadeOut(300); + $('#progress_status').html('Import done'); + $('#progress').progressbar('value', 100); + $('.viewNotice').html(responseText.message); + $('.viewNotice').fadeIn(100).delay(2000).fadeOut(300); $('#importsubmit').html(midas.import.importSubmitButtonValue); } }; @@ -81,8 +81,8 @@ midas.import.importCallback = function (responseText, statusText, xhr, form) { */ midas.import.displayStopMessage = function (data) { 'use strict'; - $(".viewNotice").html('Import has been stopped.'); - $(".viewNotice").fadeIn(100).delay(2000).fadeOut(300); + $('.viewNotice').html('Import has been stopped.'); + $('.viewNotice').fadeIn(100).delay(2000).fadeOut(300); }; /** If the button to start/stop the import has been clicked */ @@ -110,9 +110,9 @@ midas.import.assetstoreSubmit = function (formData, jqForm, options) { // Add the type is the one in the main page (because it's hidden in the assetstore add page) var assetstoretype = {}; assetstoretype.name = 'assetstoretype'; - assetstoretype.value = $("#importassetstoretype").val(); + assetstoretype.value = $('#importassetstoretype').val(); formData.push(assetstoretype); - $(".assetstoreLoading").show(); + $('.assetstoreLoading').show(); }; /** On assetstore add success */ @@ -120,18 +120,18 @@ midas.import.assetstoreAddCallback = function (responseText, statusText, xhr, fo 'use strict'; var newassetstore = {}; - $(".assetstoreLoading").hide(); + $('.assetstoreLoading').hide(); if (responseText.error) { - $(".viewNotice").html(responseText.error); - $(".viewNotice").fadeIn(100).delay(2000).fadeOut(100); + $('.viewNotice').html(responseText.error); + $('.viewNotice').fadeIn(100).delay(2000).fadeOut(100); } else if (responseText.msg) { $(document).trigger('hideCluetip'); if (responseText.assetstore_id) { - $("#assetstore").append($("") - .attr("value", responseText.assetstore_id) + $('#assetstore').append($('') + .attr('value', responseText.assetstore_id) .text(responseText.assetstore_name) - .attr("selected", "selected")); + .attr('selected', 'selected')); // Add to JSON newassetstore.assetstore_id = responseText.assetstore_id; @@ -140,8 +140,8 @@ midas.import.assetstoreAddCallback = function (responseText, statusText, xhr, fo midas.import.assetstores.push(newassetstore); } - $(".viewNotice").html(responseText.msg); - $(".viewNotice").fadeIn(100).delay(2000).fadeOut(100); + $('.viewNotice').html(responseText.msg); + $('.viewNotice').fadeIn(100).delay(2000).fadeOut(100); } }; @@ -149,8 +149,8 @@ midas.import.assetstoreAddCallback = function (responseText, statusText, xhr, fo midas.import.newAssetstoreShow = function () { 'use strict'; var assetstoretype = $('select#importassetstoretype option:selected').val(); - $('#assetstoretype').find('option:selected').removeAttr("selected"); - $('#assetstoretype').find('option[value=' + assetstoretype + ']').attr("selected", "selected"); + $('#assetstoretype').find('option:selected').removeAttr('selected'); + $('#assetstoretype').find('option[value=' + assetstoretype + ']').attr('selected', 'selected'); }; /** When the cancel is clicked in the new assetstore window */ @@ -169,10 +169,10 @@ midas.import.inputDirectoryChanged = function () { .substr(0, $('#inputdirectory').val().length - 1) .replace(/^.*[\/\\]/g, ''); } - $("#assetstorename").val(basename); + $('#assetstorename').val(basename); // set the input directory as the same - $("#assetstoreinputdirectory").val($('#inputdirectory').val()); + $('#assetstoreinputdirectory').val($('#inputdirectory').val()); }; /** When the assetstore type list is changed */ @@ -182,16 +182,16 @@ midas.import.assetstoretypeChanged = function () { assetstoretype = $('select#importassetstoretype option:selected').val(); // Set the same assetstore type for the new assetstore - $('#assetstoretype').find('option:selected').removeAttr("selected"); - $('#assetstoretype').find('option[value=' + assetstoretype + ']').attr("selected", "selected"); + $('#assetstoretype').find('option:selected').removeAttr('selected'); + $('#assetstoretype').find('option[value=' + assetstoretype + ']').attr('selected', 'selected'); // Clean the assetstore list - $("select#assetstore").find('option:not(:first)').remove(); + $('select#assetstore').find('option:not(:first)').remove(); for (i = 0; i < midas.import.assetstores.length; i += 1) { if (midas.import.assetstores[i].type === assetstoretype) { - $("select#assetstore").append($("") - .attr("value", midas.import.assetstores[i].assetstore_id).text(midas.import.assetstores[i].name)); + $('select#assetstore').append($('') + .attr('value', midas.import.assetstores[i].assetstore_id).text(midas.import.assetstores[i].name)); } } }; @@ -205,15 +205,15 @@ midas.import.makeProgressSuccessCallback = function (id) { if (html) { if (html.percent !== 'NA') { - $("#progress").show(); - $("#progress_status").show(); + $('#progress').show(); + $('#progress_status').show(); - $("#progress_status").html('Importing files ' + html.current + + $('#progress_status').html('Importing files ' + html.current + '/' + html.max + ' (' + html.percent + '%)'); - $("#progress").progressbar("value", html.percent); + $('#progress').progressbar('value', html.percent); } } - window.setTimeout("midas.import.checkProgress(" + id + ")", 3000); + window.setTimeout('midas.import.checkProgress(' + id + ')', 3000); }; }; @@ -231,7 +231,7 @@ midas.import.checkProgress = function (id) { } $.ajax({ - type: "GET", + type: 'GET', url: $('.webroot').val() + '/import/getprogress?id=' + encodeURIComponent(id), dataType: 'json', timeout: 10000000000, @@ -272,13 +272,13 @@ $(document).ready(function () { onShow: midas.import.newAssetstoreShow }); - $("#progress").progressbar(); + $('#progress').progressbar(); // Not possible to change the type of an assetstore. This is based on a // previous choice by the user - $("#assetstoretype").attr('disabled', 'disabled'); + $('#assetstoretype').attr('disabled', 'disabled'); - midas.import.importSubmitButtonValue = $("#importsubmit").html(); + midas.import.importSubmitButtonValue = $('#importsubmit').html(); // Init Browser $('input[name=importFolder]').val(''); @@ -287,7 +287,7 @@ $(document).ready(function () { $('input[name=importFolder]').before(''); $('input[name=importFolder]').before(''); $('#browseMIDASLink').click(function () { - midas.loadDialog("select", "/browse/movecopy/?selectElement=true"); + midas.loadDialog('select', '/browse/movecopy/?selectElement=true'); midas.showDialog('Browse'); }); }); diff --git a/core/public/js/install/install.step2.js b/core/public/js/install/install.step2.js index 5efd47c74..f1dc698e8 100644 --- a/core/public/js/install/install.step2.js +++ b/core/public/js/install/install.step2.js @@ -53,15 +53,15 @@ function checkDB(obj) { obj.find('.testOk').hide(); obj.find('.testNok').hide(); obj.find('.testError').html(''); - if (obj.find('[name=type]').val() != 'sqlite' && (obj.find('[name=host]').val() == '' || obj.find('[name=port]').val() == "") && obj.find('[name=unix_socket]').val() == '') { + if (obj.find('[name=type]').val() != 'sqlite' && (obj.find('[name=host]').val() == '' || obj.find('[name=port]').val() == '') && obj.find('[name=unix_socket]').val() == '') { obj.find('.testNok').show(); - obj.find('.testError').html("Please set the host and port or the socket."); + obj.find('.testError').html('Please set the host and port or the socket.'); obj.find('.testLoading').hide(); return; } $.ajax({ - type: "POST", + type: 'POST', url: json.global.webroot + '/install/testconnection', data: { type: obj.find('[name=type]').val(), @@ -75,7 +75,6 @@ function checkDB(obj) { cache: false, success: function (jsonContent) { var testConnexion = $.parseJSON(jsonContent); - console.log(jsonContent); obj.find('.testLoading').hide(); if (testConnexion[0] == true) { obj.find('.testOk').show(); @@ -91,9 +90,9 @@ function checkDB(obj) { function checkEmail(mailteste) { 'use strict'; - var local = 'a-zA-Z0-9\x21\x23\x24\x25\x26\x27\x2a\x2b\x2d\x2f\x3d\x3f\x5e\x5f\x60\x7b\x7c\x7d\x7e'; - var host = 'a-z0-9\x2d\x2e'; - var reg = new RegExp('^['+local+']+(\x2e+['+local+']+)*@['+host+']{1,63}$', 'i'); + var local = 'a-zA-Z0-9\x21\x23\x24\x25\x26\x27\x2a\x2b\x2d\x2f\x3d\x3f\x5e\x5f\x60\x7b\x7c\x7d\x7e'; + var host = 'a-z0-9\x2d\x2e'; + var reg = new RegExp('^[' + local + ']+(\x2e+[' + local + ']+)*@[' + host + ']{1,63}$', 'i'); if (reg.test(mailteste)) { return (true); diff --git a/core/public/js/item/item.editmetadata.js b/core/public/js/item/item.editmetadata.js index 1a5b5d37f..fff7fa200 100644 --- a/core/public/js/item/item.editmetadata.js +++ b/core/public/js/item/item.editmetadata.js @@ -10,7 +10,7 @@ midas.item.initElementMetaData = function () { $.each(midas.item.jsonMetadata[value], function (i, l) { availableTags.push(i); }); - $("input[name=element]").autocomplete({ + $('input[name=element]').autocomplete({ source: availableTags, change: function () { midas.item.initElementMetaData(); @@ -28,7 +28,7 @@ midas.item.initQualifierMetaData = function () { availableTags.push(l.qualifier); }); - $("input[name=qualifier]").autocomplete({ + $('input[name=qualifier]').autocomplete({ source: availableTags, change: function () { midas.item.initElementMetaData(); diff --git a/core/public/js/item/item.view.js b/core/public/js/item/item.view.js index 6f75b2a3f..a1219ec65 100644 --- a/core/public/js/item/item.view.js +++ b/core/public/js/item/item.view.js @@ -25,8 +25,8 @@ $(document).ready(function () { }); $('a.metadataDeleteLink img').fadeTo('fast', 0.4); $('a.metadataDeleteLink img').hover(function () { - $(this).fadeTo('fast', 1.0); - }, + $(this).fadeTo('fast', 1.0); + }, function () { $(this).fadeTo('fast', 0.4); }); @@ -50,48 +50,48 @@ $(document).ready(function () { deleteMetadata: true }); metadataCell.remove(); - $("div.MainDialog").dialog('close'); + $('div.MainDialog').dialog('close'); }); $('input.deleteMetaDataNo').unbind('click').click(function () { - $("div.MainDialog").dialog('close'); + $('div.MainDialog').dialog('close'); }); }); $('a.metadataEditLink img').fadeTo('fast', 0.4); $('a.metadataEditLink img').hover(function () { - $(this).fadeTo('fast', 1.0); - }, + $(this).fadeTo('fast', 1.0); + }, function () { $(this).fadeTo('fast', 0.4); }); $('a.metadataEditLink').click(function () { var metadataId = $(this).attr('element'); var itemrevision = $(this).attr('itemrevision'); - midas.loadDialog("editmetadata" + metadataId, "/item/editmetadata/?metadataId=" + encodeURIComponent(metadataId) + "&itemId=" + encodeURIComponent(json.item.item_id) + "&itemrevision=" + encodeURIComponent(itemrevision)); + midas.loadDialog('editmetadata' + metadataId, '/item/editmetadata/?metadataId=' + encodeURIComponent(metadataId) + '&itemId=' + encodeURIComponent(json.item.item_id) + '&itemrevision=' + encodeURIComponent(itemrevision)); midas.showDialog('MetaData'); }); $('a.addMetadataLink').click(function () { var metadataId = $(this).attr('element'); - midas.loadDialog("editmetadata" + metadataId, "/item/editmetadata/?itemId=" + encodeURIComponent(json.item.item_id)); + midas.loadDialog('editmetadata' + metadataId, '/item/editmetadata/?itemId=' + encodeURIComponent(json.item.item_id)); var options = { buttons: { - "Add": function () { - $(this).dialog("close"); + 'Add': function () { + $(this).dialog('close'); // since we are adding, be sure that the metadata doesn't already exist // if it does, give the user an error message and don't add the new metadata var requestData = {}; - requestData["element"] = $('#midas_item_metadata_element').val(); - requestData["qualifier"] = $('#midas_item_metadata_qualifier').val(); - requestData["metadatatype"] = $('#midas_item_metadata_metadatatype').val(); - requestData["itemId"] = json.item.item_id; + requestData['element'] = $('#midas_item_metadata_element').val(); + requestData['qualifier'] = $('#midas_item_metadata_qualifier').val(); + requestData['metadatatype'] = $('#midas_item_metadata_metadatatype').val(); + requestData['itemId'] = json.item.item_id; $.ajax({ - type: "POST", - url: json.global.webroot + "/item/getmetadatavalueexists", + type: 'POST', + url: json.global.webroot + '/item/getmetadatavalueexists', data: requestData, success: function (jsonContent) { var data = $.parseJSON(jsonContent); - if (data.exists === "1") { - midas.createNotice("Metadata already exists for that metadatatype, element and qualifier", 4000, 'error'); + if (data.exists === '1') { + midas.createNotice('Metadata already exists for that metadatatype, element and qualifier', 4000, 'error'); // clear the form values $('#midas_item_metadata_element').val(''); $('#midas_item_metadata_qualifier').val(''); @@ -110,8 +110,8 @@ $(document).ready(function () { $('a.deleteItemRevision img').fadeTo('fast', 0.4); $('a.deleteItemRevision img').hover(function () { - $(this).fadeTo('fast', 1.0); - }, + $(this).fadeTo('fast', 1.0); + }, function () { $(this).fadeTo('fast', 0.4); }); @@ -131,21 +131,21 @@ $(document).ready(function () { midas.showDialogWithContent(json.item.message['delete'], html, false); $('input.deleteItemRevisionYes').unbind('click').click(function () { - $("div.MainDialog").dialog('close'); + $('div.MainDialog').dialog('close'); $('#deleteItemrevisionForm' + itemrevisionId).submit(); }); $('input.deleteItemRevisionNo').unbind('click').click(function () { - $("div.MainDialog").dialog('close'); + $('div.MainDialog').dialog('close'); }); }); $('a.duplicateItemLink').click(function () { - midas.loadDialog("duplicateItem", "/browse/movecopy/?duplicate=true&items=" + encodeURIComponent(json.item.item_id)); + midas.loadDialog('duplicateItem', '/browse/movecopy/?duplicate=true&items=' + encodeURIComponent(json.item.item_id)); midas.showDialog('Copy item'); }); $('a.linkItemLink').click(function () { - midas.loadDialog("linkToItem", "/share/links?type=item&id=" + encodeURIComponent(json.item.item_id)); + midas.loadDialog('linkToItem', '/share/links?type=item&id=' + encodeURIComponent(json.item.item_id)); midas.showDialog('Link to this item'); }); @@ -181,7 +181,7 @@ $(document).ready(function () { content: 'Edit bitstream' }).click(function () { var bitstreamId = $(this).attr('element'); - midas.loadDialog("editBitstream" + bitstreamId, "/item/editbitstream?bitstreamId=" + encodeURIComponent(bitstreamId)); + midas.loadDialog('editBitstream' + bitstreamId, '/item/editbitstream?bitstreamId=' + encodeURIComponent(bitstreamId)); midas.showDialog(json.browse.editBitstream, false, { width: 380 }); @@ -204,9 +204,9 @@ $(document).ready(function () { html += '
    '; midas.showDialogWithContent(json.item.message['delete'], html, false); $('input.deleteBitstreamYes').unbind('click').click(function () { - $("div.MainDialog").dialog('close'); + $('div.MainDialog').dialog('close'); $.ajax({ - type: "POST", + type: 'POST', url: json.global.webroot + '/item/deletebitstream', data: { bitstreamId: bitstreamId @@ -221,13 +221,13 @@ $(document).ready(function () { }); }); $('input.deleteBitstreamNo').unbind('click').click(function () { - $("div.MainDialog").dialog('close'); + $('div.MainDialog').dialog('close'); }); }); $('a#itemDeleteLink').click(function () { $.ajax({ - type: "GET", + type: 'GET', url: json.global.webroot + '/item/checkshared', data: { itemId: json.item.item_id @@ -253,14 +253,14 @@ $(document).ready(function () { location.replace(json.global.webroot + '/item/delete?itemId=' + encodeURIComponent(json.item.item_id)); }); $('input.deleteItemNo').unbind('click').click(function () { - $("div.MainDialog").dialog('close'); + $('div.MainDialog').dialog('close'); }); } }); }); $('a.sharingLink').click(function () { - midas.loadDialog("sharing" + $(this).attr('type') + $(this).attr('element'), "/share/dialog?type=" + encodeURIComponent($(this).attr('type')) + '&element=' + encodeURIComponent($(this).attr('element'))); + midas.loadDialog('sharing' + $(this).attr('type') + $(this).attr('element'), '/share/dialog?type=' + encodeURIComponent($(this).attr('type')) + '&element=' + encodeURIComponent($(this).attr('element'))); midas.showDialog(json.browse.share); }); @@ -270,7 +270,7 @@ $(document).ready(function () { // Set the text to an image HTML string with the correct src URL to the loading image you want to use text: 'Loading...', ajax: { - url: json.global.webroot + "/upload/revision?itemId=" + encodeURIComponent(itemId) // Use the rel attribute of each element for the url to load + url: json.global.webroot + '/upload/revision?itemId=' + encodeURIComponent(itemId) // Use the rel attribute of each element for the url to load }, title: { text: $('a.uploadRevisionLink').html(), // Give the tooltip a title using each elements text @@ -301,7 +301,7 @@ $(document).ready(function () { }); $('a.editItemLink').click(function () { - midas.loadDialog("editItem" + json.item.item_id, "/item/edit?itemId=" + encodeURIComponent(json.item.item_id)); + midas.loadDialog('editItem' + json.item.item_id, '/item/edit?itemId=' + encodeURIComponent(json.item.item_id)); midas.showDialog(json.browse.editItem, false, { width: 545 }); diff --git a/core/public/js/jquery/jquery.autogrow-textarea.js b/core/public/js/jquery/jquery.autogrow-textarea.js index 16d8ea6d9..c9ce31e9b 100644 --- a/core/public/js/jquery/jquery.autogrow-textarea.js +++ b/core/public/js/jquery/jquery.autogrow-textarea.js @@ -34,12 +34,12 @@ .replace(/&/g, '&') .replace(/\n$/, '
     ') .replace(/\n/g, '
    ') - .replace(/ {2,}/g, function(space) { return times(' ', space.length -1) + ' ' }); + .replace(/ {2,}/g, function(space) { return times(' ', space.length -1) + ' '; }); shadow.html(val); $(this).css('height', Math.max(shadow.height() + 20, minHeight)); - } + }; $(this).change(update).keyup(update).keydown(update); @@ -49,6 +49,6 @@ return this; - } + }; })(jQuery); diff --git a/core/public/js/jquery/jquery.checkboxrange.js b/core/public/js/jquery/jquery.checkboxrange.js index 40dfa69be..0cf589dc1 100644 --- a/core/public/js/jquery/jquery.checkboxrange.js +++ b/core/public/js/jquery/jquery.checkboxrange.js @@ -1,25 +1,25 @@ (function($) { - $.fn.enableCheckboxRangeSelection = function(opts) { - var defaults = { - onRangeSelect: null - }; - var options = $.extend({}, defaults, opts); - var lastCheckbox = null; - var $spec = this; - $spec.unbind("click.checkboxrange"); - $spec.bind("click.checkboxrange", function(e) { - if (lastCheckbox != null && (e.shiftKey || e.metaKey)) { - $spec.slice( + $.fn.enableCheckboxRangeSelection = function(opts) { + var defaults = { + onRangeSelect: null + }; + var options = $.extend({}, defaults, opts); + var lastCheckbox = null; + var $spec = this; + $spec.unbind('click.checkboxrange'); + $spec.bind('click.checkboxrange', function(e) { + if (lastCheckbox != null && (e.shiftKey || e.metaKey)) { + $spec.slice( Math.min($spec.index(lastCheckbox), $spec.index(e.target)), Math.max($spec.index(lastCheckbox), $spec.index(e.target)) + 1 - ).attr({checked: e.target.checked ? "checked" : ""}); + ).attr({checked: e.target.checked ? 'checked' : ''}); - if ($.isFunction(options.onRangeSelect)) { - options.onRangeSelect.call(); + if ($.isFunction(options.onRangeSelect)) { + options.onRangeSelect.call(); } } - lastCheckbox = e.target; + lastCheckbox = e.target; }); }; })(jQuery); diff --git a/core/public/js/layout/midas.dialog.js b/core/public/js/layout/midas.dialog.js index 817f78e12..47759dfd4 100644 --- a/core/public/js/layout/midas.dialog.js +++ b/core/public/js/layout/midas.dialog.js @@ -7,8 +7,8 @@ midas.loadDialog = function (name, url) { 'use strict'; if ($('.DialogContentPage').val() != name) { $('.DialogContentPage').val(name); - $('div.MainDialogContent').html(""); - $("div.MainDialogLoading").show(); + $('div.MainDialogContent').html(''); + $('div.MainDialogLoading').show(); $.ajax({ url: $('.webroot').val() + url, // contentType: "application/x-www-form-urlencoded;charset=UTF-8", @@ -41,8 +41,8 @@ midas.showDialog = function (title, button, opts) { }; if (button) { options.buttons = { - "Ok": function () { - $(this).dialog("close"); + 'Ok': function () { + $(this).dialog('close'); } }; } @@ -80,7 +80,7 @@ midas.showBigDialogWithContent = function (title, content, button) { 'use strict'; $('.DialogContentPage').val(''); $('div.MainDialogContent').html(content); - $("div.MainDialogLoading").hide(); + $('div.MainDialogLoading').hide(); midas.showBigDialog(title, button); }; @@ -96,17 +96,17 @@ midas.loadAjaxDynamicBar = function (name, url) { if ($('.DynamicContentPage').val() != name) { $('.DynamicContentPage').val(name); $('div.TopDynamicContent').fadeOut('slow', function () { - $('div.TopDynamicContent').html(""); - $("div.TopDynamicLoading").show(); + $('div.TopDynamicContent').html(''); + $('div.TopDynamicLoading').show(); $.ajax({ url: $('.webroot').val() + url, - contentType: "application/x-www-form-urlencoded;charset=UTF-8", + contentType: 'application/x-www-form-urlencoded;charset=UTF-8', success: function (data) { - $("div.TopDynamicLoading").hide(); + $('div.TopDynamicLoading').hide(); $('div.TopDynamicContent').hide(); $('div.TopDynamicContent').html(data); - $('div.TopDynamicContent').fadeIn("slow"); + $('div.TopDynamicContent').fadeIn('slow'); } }); }); @@ -121,12 +121,12 @@ midas.showOrHideDynamicBar = function (name) { midas.showDialog(name); return; } - if ($("div.TopDynamicBar").is(':hidden')) { - $("div.TopDynamicBar").show('blind', function () { + if ($('div.TopDynamicBar').is(':hidden')) { + $('div.TopDynamicBar').show('blind', function () { $('#email').focus(); }); } else if ($('.DynamicContentPage').val() == name) { - $("div.TopDynamicBar").hide('blind'); + $('div.TopDynamicBar').hide('blind'); } }; diff --git a/core/public/js/layout/midas.empty.js b/core/public/js/layout/midas.empty.js index dabdbc418..33f0ab735 100644 --- a/core/public/js/layout/midas.empty.js +++ b/core/public/js/layout/midas.empty.js @@ -7,13 +7,6 @@ var json = json || {}; var midas = midas || {}; -// Prevent error if console.log is called -if (typeof console != "object") { - var console = { - 'log': function () {} - }; -} - $(function () { 'use strict'; // Parse json content diff --git a/core/public/js/layout/midas.layout.js b/core/public/js/layout/midas.layout.js index 9b32d8f16..609348500 100644 --- a/core/public/js/layout/midas.layout.js +++ b/core/public/js/layout/midas.layout.js @@ -4,13 +4,6 @@ var json = json || {}; var midas = midas || {}; var itemselected = false; -// Prevent error if console.log is called -if (typeof console != "object") { - var console = { - 'log': function () {} - }; -} - // Main calls $(function () { 'use strict'; @@ -49,9 +42,9 @@ $(function () { } function showStartingGuide() { - $("#dialogStartingGuide").dialog({ + $('#dialogStartingGuide').dialog({ width: 580, - title: $("#dialogStartingGuide").attr('title'), + title: $('#dialogStartingGuide').attr('title'), modal: true }); } @@ -61,7 +54,7 @@ $(function () { if ($(this).is(':checked')) { value = 0; } - $.post(json.global.webroot + "/user/startingguide", { + $.post(json.global.webroot + '/user/startingguide', { value: value }); }); @@ -77,51 +70,51 @@ $(function () { }); $('#blockSettingsLink').click(function () { midas.loadAjaxDynamicBar('settings', '/user/settings'); - if ($("div.TopDynamicBar").is(':hidden')) { - $("div.TopDynamicBar").show('blind', function () { + if ($('div.TopDynamicBar').is(':hidden')) { + $('div.TopDynamicBar').show('blind', function () { }); } - $('#dialogStartingGuide').dialog("close"); + $('#dialogStartingGuide').dialog('close'); }); // Login - $("a.loginLink").click(function () { + $('a.loginLink').click(function () { midas.showOrHideDynamicBar('login'); midas.loadAjaxDynamicBar('login', '/user/login'); }); // Setting link - $("li.settingsLink").click(function () { - if ($("div.TopDynamicBar").is(':hidden')) { - $("div.TopDynamicBar").show('blind', function () {}); + $('li.settingsLink').click(function () { + if ($('div.TopDynamicBar').is(':hidden')) { + $('div.TopDynamicBar').show('blind', function () {}); } midas.loadAjaxDynamicBar('settings', '/user/settings'); }); // Module link - $("li.modulesLink").click(function () { - if ($("div.TopDynamicBar").is(':hidden')) { - $("div.TopDynamicBar").show('blind', function () {}); + $('li.modulesLink').click(function () { + if ($('div.TopDynamicBar').is(':hidden')) { + $('div.TopDynamicBar').show('blind', function () {}); } midas.loadAjaxDynamicBar('settings', '/user/settings'); }); // Register link - $("a.registerLink").click(function () { + $('a.registerLink').click(function () { midas.showOrHideDynamicBar('register'); midas.loadAjaxDynamicBar('register', '/user/register'); }); // Search Bar ----------------------- // Live search - $.widget("custom.catcomplete", $.ui.autocomplete, { + $.widget('custom.catcomplete', $.ui.autocomplete, { _renderMenu: function (ul, items) { var self = this, - currentCategory = ""; + currentCategory = ''; $.each(items, function (index, item) { if (item.category != currentCategory) { - ul.append('
  • ' + item.category + "
  • "); + ul.append('
  • ' + item.category + '
  • '); currentCategory = item.category; } self._renderItemData(ul, item); @@ -131,7 +124,7 @@ $(function () { var cache = {}, lastXhr; - $("#live_search").catcomplete({ + $('#live_search').catcomplete({ minLength: 2, delay: 10, source: function (request, response) { @@ -141,10 +134,10 @@ $(function () { return; } - $("#searchloading").show(); + $('#searchloading').show(); - lastXhr = $.getJSON($('.webroot').val() + "/search/live", request, function (data, status, xhr) { - $("#searchloading").hide(); + lastXhr = $.getJSON($('.webroot').val() + '/search/live', request, function (data, status, xhr) { + $('#searchloading').hide(); cache[term] = data; if (xhr === lastXhr) { itemselected = false; @@ -254,7 +247,7 @@ $(function () { } else { midas.createNotice(json.login.contentUploadLogin, 4000); - $("div.TopDynamicBar").show('blind'); + $('div.TopDynamicBar').show('blind'); midas.loadAjaxDynamicBar('login', '/user/login'); } }); @@ -264,9 +257,9 @@ $(function () { $('#menuUserInfo').click(function () { globalAuthAsk(json.global.webroot + '/user/userpage'); }); - $("div.TopDynamicBar .closeButton").click(function () { - if (!$("div.TopDynamicBar").is(':hidden')) { - $("div.TopDynamicBar").hide('blind'); + $('div.TopDynamicBar .closeButton').click(function () { + if (!$('div.TopDynamicBar').is(':hidden')) { + $('div.TopDynamicBar').hide('blind'); } }); @@ -289,7 +282,7 @@ function globalAuthAsk(url) { } else { midas.createNotice(json.login.titleUploadLogin, 4000); - $("div.TopDynamicBar").show('blind'); + $('div.TopDynamicBar').show('blind'); midas.loadAjaxDynamicBar('login', '/user/login'); } } @@ -336,16 +329,16 @@ function TimerQtip() { if (!$('#dialogStartingGuide').is(':hidden')) { iQtips = 0; - setTimeout("TimerQtip()", 1000); + setTimeout('TimerQtip()', 1000); return; } qtipsHelp[iQtips].qtip('show'); if (qtipsHelp.length > iQtips + 1) { - setTimeout("TimerQtip()", 5000); + setTimeout('TimerQtip()', 5000); } else { - setTimeout("StopTimerQtip()", 5000); + setTimeout('StopTimerQtip()', 5000); } iQtips++; } diff --git a/core/public/js/layout/midas.notice.js b/core/public/js/layout/midas.notice.js index 7b6a3e6ac..8cef80f7d 100644 --- a/core/public/js/layout/midas.notice.js +++ b/core/public/js/layout/midas.notice.js @@ -28,7 +28,6 @@ midas.createNotice = function (text, delay, state) { */ function createNotice(text, delay, state) { 'use strict'; - console.log('WARNING: createNotice is deprecated, use midas.createNotice instead'); midas.createNotice(text, delay, state); } diff --git a/core/public/js/rest/rest.index.js b/core/public/js/rest/rest.index.js index 94dfbad9d..f8f6be1ce 100644 --- a/core/public/js/rest/rest.index.js +++ b/core/public/js/rest/rest.index.js @@ -1,6 +1,7 @@ // Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. /* global json */ +/* global SwaggerUi */ var midas = midas || {}; midas.rest = midas.rest || {}; @@ -10,23 +11,10 @@ $(document).ready(function () { window.swaggerUi = new SwaggerUi({ discoveryUrl: json.global.webroot + '/apidocs/', apiKey: null, - dom_id: "swagger-ui-container", + dom_id: 'swagger-ui-container', supportHeaderParams: false, supportedSubmitMethods: ['get', 'post', 'put', 'delete'], - onComplete: function (swaggerApi, swaggerUi) { - if (console) { - console.log("Loaded SwaggerUI"); - console.log(swaggerApi); - console.log(swaggerUi); - } - }, - onFailure: function (data) { - if (console) { - console.log("Unable to Load SwaggerUI"); - console.log(data); - } - }, - docExpansion: "none" + docExpansion: 'none' }); window.swaggerUi.load(); diff --git a/core/public/js/search/search.index.js b/core/public/js/search/search.index.js index cbc46cdf2..d60076ad6 100644 --- a/core/public/js/search/search.index.js +++ b/core/public/js/search/search.index.js @@ -5,7 +5,7 @@ $(document).ready(function () { 'use strict'; - json.search.keyword = $("
    ").html(json.search.keyword).text(); // remove html entity encoding + json.search.keyword = $('
    ').html(json.search.keyword).text(); // remove html entity encoding $('#live_search_value').val($('#live_search').val()); $('#live_search').val(json.search.keyword); @@ -78,10 +78,10 @@ function changeSorting(order) { $('img.searchLoading').show(); $('ul#searchResults').hide(); $.post(json.global.webroot + '/search', { - q: json.search.keyword, - ajax: true, - order: order - }, + q: json.search.keyword, + ajax: true, + order: order + }, function (data) { var tmp = $.parseJSON(data); json.search.results = tmp.results; @@ -130,28 +130,28 @@ function createSearchResults(element) { 'use strict'; var html = ''; if (element.resultType == 'user') { - html = ""; - html += "" + sliceFileName(element.firstname + ' ' + element.lastname, 45) + "
    "; - html += "" + element.company + ""; - html += "" + element.formattedDate + ""; + html = ''; + html += '' + sliceFileName(element.firstname + ' ' + element.lastname, 45) + '
    '; + html += '' + element.company + ''; + html += '' + element.formattedDate + ''; } if (element.resultType == 'item') { - html = ""; - html += "" + sliceFileName(element.name, 45) + "
    "; - html += "" + element.description + ""; - html += "" + element.formattedDate + ""; + html = ''; + html += '' + sliceFileName(element.name, 45) + '
    '; + html += '' + element.description + ''; + html += '' + element.formattedDate + ''; } if (element.resultType == 'folder') { - html = ""; - html += "" + sliceFileName(element.name, 45) + "
    "; - html += "" + element.description + ""; - html += "" + element.formattedDate + ""; + html = ''; + html += '' + sliceFileName(element.name, 45) + '
    '; + html += '' + element.description + ''; + html += '' + element.formattedDate + ''; } if (element.resultType == 'community') { - html = ""; - html += "" + sliceFileName(element.name, 45) + "
    "; - html += "" + element.description + ""; - html += "" + element.formattedDate + ""; + html = ''; + html += '' + sliceFileName(element.name, 45) + '
    '; + html += '' + element.description + ''; + html += '' + element.formattedDate + ''; } return '
  • ' + html + '
  • '; diff --git a/core/public/js/share/share.dialog.js b/core/public/js/share/share.dialog.js index 7efe0e661..d8e522a26 100644 --- a/core/public/js/share/share.dialog.js +++ b/core/public/js/share/share.dialog.js @@ -8,10 +8,10 @@ var jsonShare = $.parseJSON($('div.jsonShareContent').html()); $('a#setElementPublicLink').click(function () { 'use strict'; $.post(json.global.webroot + '/share/dialog', { - setPublic: true, - type: jsonShare.type, - element: jsonShare.element - }, + setPublic: true, + type: jsonShare.type, + element: jsonShare.element + }, function (data) { var jsonResponse = $.parseJSON(data); if (jsonResponse[0]) { @@ -33,12 +33,12 @@ $('a.removeShareLink').click(function () { var removeId = $(this).parents('tr').attr('element'); var obj = $(this).parents('tr'); $.post(json.global.webroot + '/share/dialog', { - removePolicy: true, - removeType: removeType, - removeId: removeId, - type: jsonShare.type, - element: jsonShare.element - }, + removePolicy: true, + removeType: removeType, + removeId: removeId, + type: jsonShare.type, + element: jsonShare.element + }, function (data) { var jsonResponse = $.parseJSON(data); if (jsonResponse[0]) { @@ -59,13 +59,13 @@ $('select.changePermissionSelect').change(function () { var changeVal = $(this).val(); var obj = $(this).parents('tr'); $.post(json.global.webroot + '/share/dialog', { - changePolicy: true, - changeVal: changeVal, - changeType: changeType, - changeId: changeId, - type: jsonShare.type, - element: jsonShare.element - }, + changePolicy: true, + changeVal: changeVal, + changeType: changeType, + changeId: changeId, + type: jsonShare.type, + element: jsonShare.element + }, function (data) { var jsonResponse = $.parseJSON(data); if (jsonResponse[0]) { @@ -81,10 +81,10 @@ $('select.changePermissionSelect').change(function () { $('a#setElementPrivateLink').click(function () { 'use strict'; $.post(json.global.webroot + '/share/dialog', { - setPrivate: true, - type: jsonShare.type, - element: jsonShare.element - }, + setPrivate: true, + type: jsonShare.type, + element: jsonShare.element + }, function (data) { var jsonResponse = $.parseJSON(data); if (jsonResponse[0]) { @@ -101,14 +101,14 @@ $('a#setElementPrivateLink').click(function () { }); // Live search -$.widget("custom.catcomplete", $.ui.autocomplete, { +$.widget('custom.catcomplete', $.ui.autocomplete, { _renderMenu: function (ul, items) { 'use strict'; var self = this, - currentCategory = ""; + currentCategory = ''; $.each(items, function (index, item) { if (item.category != currentCategory) { - ul.append('
  • ' + item.category + "
  • "); + ul.append('
  • ' + item.category + '
  • '); currentCategory = item.category; } self._renderItemData(ul, item); @@ -119,7 +119,7 @@ $.widget("custom.catcomplete", $.ui.autocomplete, { var shareSearchcache = {}, lastShareXhr; var itemShareSelected; -$("#live_share_search").catcomplete({ +$('#live_share_search').catcomplete({ minLength: 2, delay: 10, source: function (request, response) { @@ -130,11 +130,11 @@ $("#live_share_search").catcomplete({ return; } - $("#searchShareLoading").show(); + $('#searchShareLoading').show(); - lastShareXhr = $.getJSON($('.webroot').val() + "/search/live?shareSearch=true", request, + lastShareXhr = $.getJSON($('.webroot').val() + '/search/live?shareSearch=true', request, function (data, status, xhr) { - $("#searchShareLoading").hide(); + $('#searchShareLoading').hide(); shareSearchcache[term] = data; if (xhr === lastShareXhr) { itemShareSelected = false; @@ -162,17 +162,17 @@ $("#live_share_search").catcomplete({ return; } $.post(json.global.webroot + '/share/dialog', { - createPolicy: true, - newPolicyType: newPolicyType, - newPolicyId: newPolicyId, - type: jsonShare.type, - element: jsonShare.element - }, + createPolicy: true, + newPolicyType: newPolicyType, + newPolicyId: newPolicyId, + type: jsonShare.type, + element: jsonShare.element + }, function (data) { var jsonResponse = $.parseJSON(data); if (jsonResponse[0]) { midas.createNotice(jsonResponse[1], 1500); - midas.loadDialog("sharing" + $(this).attr('type') + $(this).attr('element') + newPolicyId, "/share/dialog?type=" + encodeURIComponent(jsonShare.type) + '&element=' + encodeURIComponent(jsonShare.element)); + midas.loadDialog('sharing' + $(this).attr('type') + $(this).attr('element') + newPolicyId, '/share/dialog?type=' + encodeURIComponent(jsonShare.type) + '&element=' + encodeURIComponent(jsonShare.element)); midas.showDialog(json.browse.share); } else { @@ -204,8 +204,8 @@ $('#live_share_search').focusout(function () { $('input.permissionsDone').click(function () { 'use strict'; $('div.MainDialog').dialog('close'); - if (jsonShare.type == "folder") { - midas.loadDialog("applyRecursive" + jsonShare.element, "/share/applyrecursivedialog?folderId=" + encodeURIComponent(jsonShare.element)); + if (jsonShare.type == 'folder') { + midas.loadDialog('applyRecursive' + jsonShare.element, '/share/applyrecursivedialog?folderId=' + encodeURIComponent(jsonShare.element)); midas.showDialog(json.browse.share); } }); diff --git a/core/public/js/upload/upload.revision.js b/core/public/js/upload/upload.revision.js index 1b01756d7..2450a09b4 100644 --- a/core/public/js/upload/upload.revision.js +++ b/core/public/js/upload/upload.revision.js @@ -114,10 +114,9 @@ midas.upload.revision.initHtml5FileUpload = function () { var url = json.global.webroot + '/api/json?method=midas.upload.perform&uploadtoken=' + encodeURIComponent(uploadToken) + '&length=' + encodeURIComponent(file.size) + '&filename=' + encodeURIComponent(file.name); var changes = $('#revisionChanges').val(); - if(changes) { + if (changes) { url += '&changes=' + encodeURIComponent(changes); } - console.log(url); resumeUploadId = uploadToken; @@ -238,7 +237,6 @@ midas.upload.revision.initHtml5FileUpload = function () { $('div.uploadValidationError b').text('Could not connect to the server to resume upload.'); $('div.uploadValidationError').show(); $('#startUploadLink').removeClass('disabled'); - console.log(resp); }); }; }; @@ -252,11 +250,11 @@ $('.uploadTabs').tabs({ success: function () { 'use strict'; $('div.MainDialogLoading').hide(); - $(".uploadTabs").show(); + $('.uploadTabs').show(); }, error: function (xhr, status, index, anchor) { 'use strict'; - $(anchor.hash).html("Couldn't load this tab. "); + $(anchor.hash).html('Could not load this tab. '); } } }); diff --git a/core/public/js/upload/upload.simpleupload.js b/core/public/js/upload/upload.simpleupload.js index 65dba667c..0a08af118 100644 --- a/core/public/js/upload/upload.simpleupload.js +++ b/core/public/js/upload/upload.simpleupload.js @@ -208,7 +208,7 @@ midas.upload.simpleupload.initHtml5FileUpload = function () { } if ($('#destinationId').val() === undefined || $('#destinationId').val().length === 0) { - midas.createNotice("Please select where you want to upload your files.", 4000, 'warning'); + midas.createNotice('Please select where you want to upload your files.', 4000, 'warning'); return false; } @@ -244,7 +244,6 @@ midas.upload.simpleupload.initHtml5FileUpload = function () { $('div.uploadValidationError b').text('Could not connect to the server to resume upload.'); $('div.uploadValidationError').show(); $('#startUploadLink').removeClass('disabled'); - console.log(resp); }); }; }; @@ -258,11 +257,11 @@ $('.uploadTabs').tabs({ success: function () { 'use strict'; $('div.MainDialogLoading').hide(); - $(".uploadTabs").show(); + $('.uploadTabs').show(); }, error: function (xhr, status, index, anchor) { 'use strict'; - $(anchor.hash).html("Couldn't load this tab. "); + $(anchor.hash).html('Could not load this tab. '); } } }); @@ -278,7 +277,7 @@ midas.upload.simpleupload.initHtml5FileUpload(); $('.browseMIDASLink').click(function () { 'use strict'; - midas.loadDialog("select", "/browse/selectfolder/?policy=write"); + midas.loadDialog('select', '/browse/selectfolder/?policy=write'); midas.showDialog('Select upload destination'); }); diff --git a/core/public/js/user/user.emailregister.js b/core/public/js/user/user.emailregister.js index 7a3f369f1..23137fa36 100644 --- a/core/public/js/user/user.emailregister.js +++ b/core/public/js/user/user.emailregister.js @@ -12,8 +12,8 @@ $(document).ready(function () { 'use strict'; $('label.termLabel').after($('div.termDiv').html()); $('a.termOfService').click(function () { - midas.loadDialog("terms", "/user/termofservice"); - midas.showBigDialog("Terms of Service"); + midas.loadDialog('terms', '/user/termofservice'); + midas.showBigDialog('Terms of Service'); }); $('#registerForm').find('input').each(function () { diff --git a/core/public/js/user/user.login.js b/core/public/js/user/user.login.js index c0823d29b..71765c811 100644 --- a/core/public/js/user/user.login.js +++ b/core/public/js/user/user.login.js @@ -51,12 +51,12 @@ $(document).ready(function () { // Deal with password recovery if ($('a#forgotPasswordLink').length) { $('a#forgotPasswordLink').click(function () { - midas.loadDialog("forgotpassword", "/user/recoverpassword"); - midas.showDialog("Recover Password"); + midas.loadDialog('forgotpassword', '/user/recoverpassword'); + midas.showDialog('Recover Password'); }); } - $("a.registerLink").unbind('click').click(function () { + $('a.registerLink').unbind('click').click(function () { midas.showOrHideDynamicBar('register'); midas.loadAjaxDynamicBar('register', '/user/register'); }); diff --git a/core/public/js/user/user.manage.js b/core/public/js/user/user.manage.js index 8d6eb6e7b..1e0f01a70 100644 --- a/core/public/js/user/user.manage.js +++ b/core/public/js/user/user.manage.js @@ -20,8 +20,8 @@ $(document).ready(function () { disableElementSize: true }); - $("img.tableLoading").hide(); - $("table#browseTable").show(); + $('img.tableLoading').hide(); + $('table#browseTable').show(); $('div.communityList').hide(); @@ -62,39 +62,39 @@ function callbackCreateElement(node) { function initDragAndDrop() { 'use strict'; - $("#browseTable .file, #browseTable .filePublic, #browseTable .filePrivate," + - "#browseTable .folderPublic:not(.notdraggable), #browseTable .folderPrivate:not(.notdraggable)").draggable({ - helper: "clone", - cursor: "move", - opacity: 0.75, - refreshPositions: true, // Performance? - revert: "invalid", - revertDuration: 300, - scroll: true, + $('#browseTable .file, #browseTable .filePublic, #browseTable .filePrivate,' + + '#browseTable .folderPublic:not(.notdraggable), #browseTable .folderPrivate:not(.notdraggable)').draggable({ + helper: 'clone', + cursor: 'move', + opacity: 0.75, + refreshPositions: true, // Performance? + revert: 'invalid', + revertDuration: 300, + scroll: true, // Show communities when user starts to drag items - start: function () { - $('div.communityList').show(); - } - }); + start: function () { + $('div.communityList').show(); + } + }); - $("#browseTable .folder, #browseTable .folderPrivate, #browseTable .folderPublic").each(function () { + $('#browseTable .folder, #browseTable .folderPrivate, #browseTable .folderPublic').each(function () { // Configure droppable folders/items - $(this).parents("tr:[policy!=0]").droppable({ - accept: ".file, .filePublic, .filePrivate, .folder, .folderPublic, .folderPrivate", + $(this).parents('tr:[policy!=0]').droppable({ + accept: '.file, .filePublic, .filePrivate, .folder, .folderPublic, .folderPrivate', drop: function (e, ui) { // Call jQuery treeTable plugin to move the branch var elements = ''; - if ($(ui.draggable).parents("tr").attr('type') == 'folder') { - elements = $(ui.draggable).parents("tr").attr('element') + ';'; + if ($(ui.draggable).parents('tr').attr('type') == 'folder') { + elements = $(ui.draggable).parents('tr').attr('element') + ';'; } else { - elements = ';' + $(ui.draggable).parents("tr").attr('element'); + elements = ';' + $(ui.draggable).parents('tr').attr('element'); } var from_obj; - var classNames = $(ui.draggable).parents("tr").attr('class').split(' '); + var classNames = $(ui.draggable).parents('tr').attr('class').split(' '); for (var key in classNames) { if (classNames[key].match('child-of-')) { - from_obj = "#" + classNames[key].substring(9); + from_obj = '#' + classNames[key].substring(9); } } var destination_obj = this; @@ -102,12 +102,12 @@ function initDragAndDrop() { // do nothing if drop item(s) to its current folder, otherwise move item(s) if ($(this).attr('id') != $(from_obj).attr('id')) { $.post(json.global.webroot + '/browse/movecopy', { - moveElement: true, - elements: elements, - destination: $(destination_obj).attr('element'), - from: $(from_obj).attr('element'), - ajax: true - }, + moveElement: true, + elements: elements, + destination: $(destination_obj).attr('element'), + from: $(from_obj).attr('element'), + ajax: true + }, function (data) { var jsonResponse = $.parseJSON(data); if (jsonResponse === null) { @@ -116,7 +116,7 @@ function initDragAndDrop() { } if (jsonResponse[0]) { midas.createNotice(jsonResponse[1], 1500); - $($(ui.draggable).parents("tr")[0]).appendBranchTo(destination_obj); + $($(ui.draggable).parents('tr')[0]).appendBranchTo(destination_obj); } else { midas.createNotice(jsonResponse[1], 4000); @@ -125,28 +125,28 @@ function initDragAndDrop() { } }, - hoverClass: "accept", + hoverClass: 'accept', over: function (e, ui) { // Make the droppable branch expand when a draggable node is moved over it. - if (this.id != $(ui.draggable.parents("tr")[0]).id && !$(this).is(".expanded")) { + if (this.id != $(ui.draggable.parents('tr')[0]).id && !$(this).is('.expanded')) { $(this).expand(); } } }); // Configure non-drappable folders/items - $(this).parents("tr:[policy=0]").droppable({ + $(this).parents('tr:[policy=0]').droppable({ revert: true, // Make the droppable branch expand when a draggable node is moved over it. over: function (e, ui) { - if (!$(this).is(".expanded")) { + if (!$(this).is('.expanded')) { $(this).expand(); } } }); // qtip pop-up for folders with only read permission - $(this).parents("tr:[policy=0]").qtip({ + $(this).parents('tr:[policy=0]').qtip({ content: 'You do not have write permission on this folder and cannot drop item(s) to it !', show: 'mouseover', hide: 'mouseout', diff --git a/core/public/js/user/user.recoverpassword.js b/core/public/js/user/user.recoverpassword.js index a02b3a956..bca9d256f 100644 --- a/core/public/js/user/user.recoverpassword.js +++ b/core/public/js/user/user.recoverpassword.js @@ -21,7 +21,7 @@ midas.user.successRecoverPassword = function (responseText, statusText, xhr, for } if (jsonResponse[0]) { midas.createNotice(jsonResponse[1], 4000); - $("div.MainDialog").dialog("close"); + $('div.MainDialog').dialog('close'); } else { midas.createNotice(jsonResponse[1], 4000, 'error'); diff --git a/core/public/js/user/user.register.js b/core/public/js/user/user.register.js index f6fa5ce11..cfb13c660 100644 --- a/core/public/js/user/user.register.js +++ b/core/public/js/user/user.register.js @@ -8,8 +8,8 @@ var jsonRegister = $.parseJSON($('div.jsonRegister').html()); $('label.termLabel').after($('div.termDiv').html()); $('a.termOfService').click(function () { 'use strict'; - midas.loadDialog("terms", "/user/termofservice"); - midas.showBigDialog("Terms of Service"); + midas.loadDialog('terms', '/user/termofservice'); + midas.showBigDialog('Terms of Service'); }); $('#registerForm').find('input').each(function () { @@ -36,7 +36,7 @@ function checkAll(obj) { email = false; } else { - $.post(json.global.webroot + "/user/userexists", { + $.post(json.global.webroot + '/user/userexists', { entry: obj.val() }, function (data) { if (data.search('true') != -1) { diff --git a/core/public/js/user/user.settings.js b/core/public/js/user/user.settings.js index cb12e4701..b0e7668b4 100644 --- a/core/public/js/user/user.settings.js +++ b/core/public/js/user/user.settings.js @@ -81,10 +81,10 @@ midas.user.successPictureChange = function (responseText, statusText, xhr, form) $(window).load(function () { 'use strict'; - $("#tabsSettings").tabs(); + $('#tabsSettings').tabs(); - $("#tabsSettings").css('display', 'block'); - $("#tabsSettings").show(); + $('#tabsSettings').css('display', 'block'); + $('#tabsSettings').show(); $('#modifyPassword').ajaxForm({ beforeSubmit: midas.user.validatePasswordChange, diff --git a/core/public/js/user/user.userpage.js b/core/public/js/user/user.userpage.js index 509bf5852..ee41f3963 100644 --- a/core/public/js/user/user.userpage.js +++ b/core/public/js/user/user.userpage.js @@ -5,7 +5,7 @@ midas.user = midas.user || {}; $(document).ready(function () { 'use strict'; - $("#tabsGeneric").tabs({ + $('#tabsGeneric').tabs({ select: function (event, ui) { $('div.genericAction').show(); $('div.genericCommunities').show(); @@ -16,10 +16,10 @@ $(document).ready(function () { $('div.viewAction').hide(); } }); - $("#tabsGeneric").show(); + $('#tabsGeneric').show(); $('img.tabsLoading').hide(); - $("#browseTable").treeTable({ + $('#browseTable').treeTable({ onFirstInit: midas.enableRangeSelect, onNodeShow: midas.enableRangeSelect, onNodeHide: midas.enableRangeSelect @@ -27,8 +27,8 @@ $(document).ready(function () { midas.browser.enableSelectAll(); - $("img.tableLoading").hide(); - $("table#browseTable").show(); + $('img.tableLoading').hide(); + $('table#browseTable').show(); }); // dependence: common/browser.js diff --git a/modules/dicomanonymize/public/js/upload/upload.index.js b/modules/dicomanonymize/public/js/upload/upload.index.js index f0e7f3f4a..8614b5b8a 100644 --- a/modules/dicomanonymize/public/js/upload/upload.index.js +++ b/modules/dicomanonymize/public/js/upload/upload.index.js @@ -15,7 +15,7 @@ midas.dcma.sendParentToJavaSession = function () { $('.browseMIDASLink').click(function () { 'use strict'; - midas.loadDialog("select", "/browse/selectfolder?policy=write"); + midas.loadDialog('select', '/browse/selectfolder?policy=write'); midas.showDialog('Browse', null, { close: function () { $('.uploadApplet').show(); diff --git a/modules/dicomserver/public/js/admin/admin.index.js b/modules/dicomserver/public/js/admin/admin.index.js index b5954386e..2e0c2392d 100644 --- a/modules/dicomserver/public/js/admin/admin.index.js +++ b/modules/dicomserver/public/js/admin/admin.index.js @@ -33,7 +33,7 @@ midas.dicomserver.start = function (email, apikey) { midas.createNotice(retVal.data.message, 4000); }, error: function (XMLHttpRequest, textStatus, errorThrown) { - midas.createNotice("Failed to start storescp or dcmqrscp!", 3000, 'error'); + midas.createNotice('Failed to start storescp or dcmqrscp!', 3000, 'error'); $('textarea#apicall_failure_reason').html(XMLHttpRequest.message); $('div#apicall_failure').show(); $('div#hideError').show(); @@ -89,7 +89,7 @@ midas.dicomserver.stop = function () { midas.createNotice(retVal.data.message, 4000); }, error: function (XMLHttpRequest, textStatus, errorThrown) { - midas.createNotice("Execution of storescp stop script failed!", 3000, 'error'); + midas.createNotice('Execution of storescp stop script failed!', 3000, 'error'); $('textarea#apicall_failure_reason').html(XMLHttpRequest.message); $('div#apicall_failure').show(); $('div#hideError').show(); @@ -128,7 +128,7 @@ midas.dicomserver.checkStatus = function () { '&dcmqrscp_cmd=' + dcmqrscp_val, log: $('

    '), success: function (retVal) { - if (retVal.data.status === 3 || retVal.data.status === "3") { + if (retVal.data.status === 3 || retVal.data.status === '3') { $('span#not_running_status').hide(); $('span#only_storescp_running_status').hide(); $('span#only_dcmqrscp_running_status').hide(); @@ -136,21 +136,21 @@ midas.dicomserver.checkStatus = function () { $('span#span_start_server_user').html(retVal.data.user_email); $('div#start_server_user').show(); } - else if (retVal.data.status === 2 || retVal.data.status === "2") { + else if (retVal.data.status === 2 || retVal.data.status === '2') { $('span#not_running_status').hide(); $('span#only_storescp_running_status').hide(); $('span#only_dcmqrscp_running_status').show(); $('span#running_status').hide(); $('div#start_server_user').hide(); } - else if (retVal.data.status === 1 || retVal.data.status === "1") { + else if (retVal.data.status === 1 || retVal.data.status === '1') { $('span#not_running_status').hide(); $('span#only_storescp_running_status').show(); $('span#only_dcmqrscp_running_status').hide(); $('span#span_start_server_user').html(retVal.data.user_email); $('div#start_server_user').show(); } - else if (retVal.data.status === 0 || retVal.data.status === "0") { + else if (retVal.data.status === 0 || retVal.data.status === '0') { $('span#not_running_status').show(); $('span#only_storescp_running_status').hide(); $('span#only_dcmqrscp_running_status').hide(); @@ -188,11 +188,11 @@ $(document).ready(function () { midas.showDialogWithContent('Start DICOM server', html, false); $('input.startServerYes').unbind('click').click(function () { - $("div.MainDialog").dialog('close'); + $('div.MainDialog').dialog('close'); midas.dicomserver.start(); }); $('input.startServerNo').unbind('click').click(function () { - $("div.MainDialog").dialog('close'); + $('div.MainDialog').dialog('close'); }); }); @@ -206,11 +206,11 @@ $(document).ready(function () { midas.showDialogWithContent('Stop DICOM server', html, false); $('input.stopServerYes').unbind('click').click(function () { - $("div.MainDialog").dialog('close'); + $('div.MainDialog').dialog('close'); midas.dicomserver.stop(); }); $('input.stopServerNo').unbind('click').click(function () { - $("div.MainDialog").dialog('close'); + $('div.MainDialog').dialog('close'); }); }); diff --git a/modules/dicomserver/public/js/item/dicomserver.item.view.js b/modules/dicomserver/public/js/item/dicomserver.item.view.js index dee527964..ed3a27086 100644 --- a/modules/dicomserver/public/js/item/dicomserver.item.view.js +++ b/modules/dicomserver/public/js/item/dicomserver.item.view.js @@ -26,7 +26,7 @@ midas.dicomserver.registerAction = function () { args: 'item=' + json.item.item_id, success: function (retVal) { midas.createNotice('Dicom images registered successfully', 3000); - $("div#sideElementDicomRegistration").show(); + $('div#sideElementDicomRegistration').show(); }, error: function (retVal) { midas.createNotice(retVal.message, 3000, 'error'); @@ -45,10 +45,10 @@ midas.dicomserver.registrationStatus = function () { args: 'item=' + json.item.item_id, success: function (retVal) { if (retVal.data.status) { - $("div#sideElementDicomRegistration").show(); + $('div#sideElementDicomRegistration').show(); } else { - $("div#sideElementDicomRegistration").hide(); + $('div#sideElementDicomRegistration').hide(); } }, log: $('

    ') diff --git a/modules/googleauth/public/js/login/googleauth.login.js b/modules/googleauth/public/js/login/googleauth.login.js index 8107a9126..9344fc12d 100644 --- a/modules/googleauth/public/js/login/googleauth.login.js +++ b/modules/googleauth/public/js/login/googleauth.login.js @@ -4,4 +4,4 @@ var link = $(this); link.attr('href', link.attr('href') + window.encodeURIComponent(' ' + window.location.href)); }); -}) (); +})(); diff --git a/modules/javauploaddownload/public/js/common/common.notify.js b/modules/javauploaddownload/public/js/common/common.notify.js index 9dd6f7d09..ac212eb32 100644 --- a/modules/javauploaddownload/public/js/common/common.notify.js +++ b/modules/javauploaddownload/public/js/common/common.notify.js @@ -1,5 +1,7 @@ // Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. +/* global json */ + var midas = midas || {}; midas.javauploaddownload = midas.javauploaddownload || {}; diff --git a/modules/javauploaddownload/public/js/upload/upload.index.js b/modules/javauploaddownload/public/js/upload/upload.index.js index e4a0a4e95..9b6482d0c 100644 --- a/modules/javauploaddownload/public/js/upload/upload.index.js +++ b/modules/javauploaddownload/public/js/upload/upload.index.js @@ -16,7 +16,7 @@ midas.javauploaddownload.upload.sendParentToJavaSession = function () { $('.browseMIDASLink').click(function () { 'use strict'; - midas.loadDialog('select', "/browse/selectfolder?policy=write"); + midas.loadDialog('select', '/browse/selectfolder?policy=write'); midas.showDialog('Browse', null, { close: function () { $('.uploadApplet').show(); diff --git a/modules/mfa/public/js/config/config.usertab.js b/modules/mfa/public/js/config/config.usertab.js index ee89452e9..05c2b7c67 100644 --- a/modules/mfa/public/js/config/config.usertab.js +++ b/modules/mfa/public/js/config/config.usertab.js @@ -12,7 +12,7 @@ midas.mfa.successConfig = function (responseText, statusText, xhr, form) { jsonResponse = $.parseJSON(responseText); } catch (e) { - midas.createNotice("An error occured. Please check the logs.", 4000, 'error'); + midas.createNotice('An error occured. Please check the logs.', 4000, 'error'); return false; } if (jsonResponse === null) { diff --git a/modules/mfa/public/js/login/login.dialog.js b/modules/mfa/public/js/login/login.dialog.js index 65635eb1c..202edafa9 100644 --- a/modules/mfa/public/js/login/login.dialog.js +++ b/modules/mfa/public/js/login/login.dialog.js @@ -12,7 +12,7 @@ midas.mfa.successSubmit = function (responseText, statusText, xhr, form) { jsonResponse = $.parseJSON(responseText); } catch (e) { - midas.createNotice("An error occured. Please check the logs.", 4000, 'error'); + midas.createNotice('An error occured. Please check the logs.', 4000, 'error'); return false; } if (jsonResponse.status == 'ok') { diff --git a/modules/oauth/public/js/client/client.index.js b/modules/oauth/public/js/client/client.index.js index 5e0f3e512..dbd3b48d0 100644 --- a/modules/oauth/public/js/client/client.index.js +++ b/modules/oauth/public/js/client/client.index.js @@ -13,9 +13,9 @@ midas.oauth.newClientDialog = function () { var name = container.find('input.newClientName').attr('disabled', 'disabled').val(); $(this).attr('disabled', 'disabled'); $.post(json.global.webroot + '/oauth/client/create', { - name: name, - userId: $('.userIdValue').html() - }, + name: name, + userId: $('.userIdValue').html() + }, function (text) { var resp = $.parseJSON(text); $('div.MainDialog').dialog('close'); @@ -41,8 +41,8 @@ midas.oauth.confirmDeleteClient = function () { container.find('input').attr('disabled', 'disabled'); $.post(json.global.webroot + '/oauth/client/delete', { - clientId: clientId - }, + clientId: clientId + }, function (text) { var resp = $.parseJSON(text); $('div.MainDialog').dialog('close'); @@ -71,8 +71,8 @@ midas.oauth.confirmDeleteToken = function () { container.find('input').attr('disabled', 'disabled'); $.post(json.global.webroot + '/oauth/token/delete', { - tokenId: tokenId - }, + tokenId: tokenId + }, function (text) { var resp = $.parseJSON(text); $('div.MainDialog').dialog('close'); diff --git a/modules/pvw/public/js/paraview/paraview.common.js b/modules/pvw/public/js/paraview/paraview.common.js index 63ed6b327..2583c34ef 100644 --- a/modules/pvw/public/js/paraview/paraview.common.js +++ b/modules/pvw/public/js/paraview/paraview.common.js @@ -166,8 +166,8 @@ midas.pvw.hideStatus = function () { midas.pvw.rpcFailure = function (err) { 'use strict'; $('div.MainDialog').dialog('close'); - console.log(err); - midas.createNotice('A ParaViewWeb exception occurred, check your browser console', 4000, 'error'); + + midas.createNotice('A ParaViewWeb exception occurred.', 4000, 'error'); }; /** Show an indeterminate loading dialog with a message */ diff --git a/modules/pvw/public/js/paraview/paraview.volume.js b/modules/pvw/public/js/paraview/paraview.volume.js index aa49a9269..85b1ebb76 100644 --- a/modules/pvw/public/js/paraview/paraview.volume.js +++ b/modules/pvw/public/js/paraview/paraview.volume.js @@ -7,13 +7,13 @@ var midas = midas || {}; midas.pvw = midas.pvw || {}; midas.pvw.PRESET_TRANSFER_RGBPOINTS = { - "Grayscale": [0.0, 0, 0, 0, + 'Grayscale': [0.0, 0, 0, 0, 1.0, 1, 1, 1 ], - "X-Ray": [0.0, 1, 1, 1, + 'X-Ray': [0.0, 1, 1, 1, 1.0, 0, 0, 0 ], - "Rainbow": [0.0, 1.0, 0.0, 0.0, + 'Rainbow': [0.0, 1.0, 0.0, 0.0, 0.166667, 1.0, 0.0, 1.0, 0.333333, 0.0, 0.0, 1.0, 0.5, 0.0, 1.0, 1.0, @@ -21,7 +21,7 @@ midas.pvw.PRESET_TRANSFER_RGBPOINTS = { 0.833333, 1.0, 1.0, 0.0, 1.0, 1.0, 0.0, 0.0 ], - "Rainbow (Desaturated)": [0.0, 0.2784313725490196, 0.2784313725490196, 0.8588235294117647, + 'Rainbow (Desaturated)': [0.0, 0.2784313725490196, 0.2784313725490196, 0.8588235294117647, 0.1428, 0.0, 0.0, 0.3607843137254902, 0.2857, 0.0, 1.0, 1.0, 0.4286, 0.0, 0.5019607843137255, 0.0, @@ -30,12 +30,12 @@ midas.pvw.PRESET_TRANSFER_RGBPOINTS = { 0.8571, 0.4196078431372549, 0.0, 0.0, 1.0, 0.8784313725490196, 0.30196078431372547, 0.30196078431372547 ], - "Yellow-Orange-Brown": [0, 1.0, 1.0, 0.8313725490196079, + 'Yellow-Orange-Brown': [0, 1.0, 1.0, 0.8313725490196079, 0.33333, 0.996078431372549, 0.8509803921568627, 0.5568627450980392, 0.66667, 0.996078431372549, 0.6, 0.1607843137254902, 1.0, 0.8, 0.2980392156862745, 0.00784313725490196 ], - "Qualitative Accent 1": [0, 0.4980392156862745, 0.788235294117647, 0.4980392156862745, + 'Qualitative Accent 1': [0, 0.4980392156862745, 0.788235294117647, 0.4980392156862745, 0.1428, 0.7450980392156863, 0.6823529411764706, 0.8313725490196079, 0.2857, 0.9921568627450981, 0.7529411764705882, 0.5254901960784314, 0.4286, 1.0, 1.0, 0.6, @@ -44,7 +44,7 @@ midas.pvw.PRESET_TRANSFER_RGBPOINTS = { 0.8571, 0.7490196078431373, 0.3568627450980392, 0.09019607843137255, 1.0, 0.4, 0.4, 0.4 ], - "Qualitative Accent 2": [0, 0.4, 0.7607843137254902, 0.6470588235294118, + 'Qualitative Accent 2': [0, 0.4, 0.7607843137254902, 0.6470588235294118, 0.1428, 0.9882352941176471, 0.5529411764705883, 0.3843137254901961, 0.2857, 0.5529411764705883, 0.6274509803921569, 0.796078431372549, 0.4286, 0.9058823529411765, 0.5411764705882353, 0.7647058823529411, diff --git a/modules/remoteprocessing/public/js/executable/executable.define.js b/modules/remoteprocessing/public/js/executable/executable.define.js index 8a8df323c..61d2f1ec3 100644 --- a/modules/remoteprocessing/public/js/executable/executable.define.js +++ b/modules/remoteprocessing/public/js/executable/executable.define.js @@ -1,5 +1,6 @@ // Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. +/* global isExecutableMeta */ /* global isDefineAjax */ /* global json */ @@ -51,14 +52,14 @@ $(document).ready(function () { $(this).after('Saving...'); $(this).remove(); $.ajax({ - type: "POST", - url: json.global.webroot + "/remoteprocessing/executable/define?itemId=" + encodeURIComponent($('#itemIdExecutable').val()), + type: 'POST', + url: json.global.webroot + '/remoteprocessing/executable/define?itemId=' + encodeURIComponent($('#itemIdExecutable').val()), data: req, success: function (x) { if (typeof(isDefineAjax) == 'undefined' || !isDefineAjax) { window.location.replace($('.webroot').val() + '/item/' + encodeURIComponent(json.item.item_id)); } else { - $("div.MainDialog").dialog("close"); + $('div.MainDialog').dialog('close'); $('#metaWrapper').hide(); $('#metaPageBlock').html(''); isExecutableMeta = true; @@ -160,24 +161,24 @@ function addElement(paramaters) { function updateSortableElement() { 'use strict'; - $(".column").sortable({ - connectWith: ".column", + $('.column').sortable({ + connectWith: '.column', handle: '.portlet-header' }); - $(".portlet").addClass("ui-widget ui-widget-content ui-helper-clearfix ui-corner-all") - .find(".portlet-header") - .addClass("ui-widget-header ui-corner-all") + $('.portlet').addClass('ui-widget ui-widget-content ui-helper-clearfix ui-corner-all') + .find('.portlet-header') + .addClass('ui-widget-header ui-corner-all') .end() - .find(".portlet-content"); + .find('.portlet-content'); - $(".portlet-header .ui-icon").click(function () { - $(this).toggleClass("ui-icon-minusthick").toggleClass("ui-icon-plusthick"); - $(this).parents(".portlet:first").find(".portlet-content").toggle(); + $('.portlet-header .ui-icon').click(function () { + $(this).toggleClass('ui-icon-minusthick').toggleClass('ui-icon-plusthick'); + $(this).parents('.portlet:first').find('.portlet-content').toggle(); }); - $(".column").disableSelection(); + $('.column').disableSelection(); $('[qtip]').qtip({ content: { diff --git a/modules/remoteprocessing/public/js/job/job.init.js b/modules/remoteprocessing/public/js/job/job.init.js index 71056f647..bbaf457e8 100644 --- a/modules/remoteprocessing/public/js/job/job.init.js +++ b/modules/remoteprocessing/public/js/job/job.init.js @@ -66,8 +66,8 @@ function onFinishCallback() { $(this).after('Saving...'); $(this).remove(); $.ajax({ - type: "POST", - url: json.global.webroot + "/remoteprocessing/job/init?itemId=" + encodeURIComponent($('#selectedExecutableId').val()), + type: 'POST', + url: json.global.webroot + '/remoteprocessing/job/init?itemId=' + encodeURIComponent($('#selectedExecutableId').val()), data: req, success: function (x) { window.location.replace($('.webroot').val() + '/remoteprocessing/job/manage'); @@ -75,7 +75,7 @@ function onFinishCallback() { }); } else { - midas.createNotice("There are some errors.", 4000); + midas.createNotice('There are some errors.', 4000); } } @@ -85,7 +85,7 @@ function validateSteps(stepnumber) { // validate step 1 if (stepnumber == 2) { if ($('#selectedExecutableId').val() == '' || executableValid === false || isExecutableMeta === false) { - midas.createNotice("Please select an Executable and set its Option information", 4000); + midas.createNotice('Please select an Executable and set its Option information', 4000); isStepValid = false; } } @@ -94,7 +94,7 @@ function validateSteps(stepnumber) { var i = 0; results = []; if ($('#jobName').val() == '') { - midas.createNotice('Please set the job\'s name.', 4000); + midas.createNotice('Please set the job name.', 4000); isStepValid = false; } $('.optionWrapper').each(function () { @@ -112,7 +112,7 @@ function validateSteps(stepnumber) { isStepValid = false; } } - else if ($(this).find('.nameOutputOption').val().indexOf(".") == -1) { + else if ($(this).find('.nameOutputOption').val().indexOf('.') == -1) { if (required) { midas.createNotice('Please set an extension in the option ' + $(this).attr('name'), 4000); } @@ -186,7 +186,7 @@ function onShowStepCallback(obj) { var step_num = obj.attr('rel'); // get the current step number if (step_num == 2) { $('#browseExecutableFile').click(function () { - midas.loadDialog("selectitem_executable", "/browse/selectitem"); + midas.loadDialog('selectitem_executable', '/browse/selectitem'); midas.showDialog('Browse'); currentBrowser = 'executable'; }); @@ -210,19 +210,19 @@ function loadRecentUpload() { $('#recentuploadContentBlock').html(''); return; } - var html = "

    Or select a Recently Uploaded File:
      "; + var html = '

      Or select a Recently Uploaded File:
        '; $('#recentuploadContentBlock').html('
          '); $.each(data, function (key, val) { html += '
        • ' + val.name + '
        • '; }); - html += "
        "; + html += '
      '; $('#recentuploadContentBlock').html(html); $('.recentUploadItemLi').click(function () { $('#selectedExecutable').html($(this).find('a').html()); $('#selectedExecutableId').val($(this).attr('element')); - midas.createNotice("Please set the executable meta informaiton.", 4000); + midas.createNotice('Please set the executable meta informaiton.', 4000); $('#metaPageBlock').load(json.global.webroot + '/remoteprocessing/executable/define?itemId=' + encodeURIComponent($(this).attr('element'))); $('#metaWrapper').show(); isExecutableMeta = false; @@ -234,7 +234,7 @@ function loadRecentUpload() { function initExecutableForm() { 'use strict'; inittializedExecutableForm = true; - $("#datepicker").datetimepicker(); + $('#datepicker').datetimepicker(); $('#ui-datepicker-div').hide(); $('#checkboxSchedule').change(function () { if (!$(this).is(':checked')) { @@ -246,19 +246,19 @@ function initExecutableForm() { }); $('.selectInputFileLink').click(function () { - midas.loadDialog("selectitem_" + $(this).attr('order'), "/browse/selectitem"); + midas.loadDialog('selectitem_' + $(this).attr('order'), '/browse/selectitem'); midas.showDialog('Browse'); currentBrowser = $(this).attr('order'); }); $('.selectOutputFolderLink').click(function () { - midas.loadDialog("selectfolder_" + $(this).attr('order'), "/browse/selectfolder?policy=write"); + midas.loadDialog('selectfolder_' + $(this).attr('order'), '/browse/selectfolder?policy=write'); midas.showDialog('Browse'); currentBrowser = $(this).attr('order'); }); $('.selectInputFolderLink').click(function () { - midas.loadDialog("selectfolder_" + $(this).attr('order'), "/browse/selectfolder?policy=read"); + midas.loadDialog('selectfolder_' + $(this).attr('order'), '/browse/selectfolder?policy=read'); midas.showDialog('Browse'); currentBrowser = $(this).attr('order'); }); @@ -274,32 +274,32 @@ function itemSelectionCallback(name, id) { if (currentBrowser == 'executable') { $('#selectedExecutable').html(name); $('#selectedExecutableId').val(id); - $.post(json.global.webroot + "/remoteprocessing/job/validentry", { - entry: id, - type: "isexecutable" - }, + $.post(json.global.webroot + '/remoteprocessing/job/validentry', { + entry: id, + type: 'isexecutable' + }, function (data) { if (data.search('true') != -1) { executableValid = true; - $.post(json.global.webroot + "/remoteprocessing/job/validentry", { - entry: id, - type: "ismeta" - }, + $.post(json.global.webroot + '/remoteprocessing/job/validentry', { + entry: id, + type: 'ismeta' + }, function (data) { if (data.search('true') != -1) { isExecutableMeta = true; } else { isExecutableMeta = false; - midas.createNotice("Please set the executable meta informaiton.", 4000); - midas.loadDialog("meta_" + id, '/remoteprocessing/executable/define?itemId=' + encodeURIComponent(id)); - midas.showBigDialog("MetaInformation", false); + midas.createNotice('Please set the executable meta informaiton.', 4000); + midas.loadDialog('meta_' + id, '/remoteprocessing/executable/define?itemId=' + encodeURIComponent(id)); + midas.showBigDialog('MetaInformation', false); } }); } else { executableValid = false; - midas.createNotice("The selected item is not a valid executable", 4000); + midas.createNotice('The selected item is not a valid executable', 4000); } }); diff --git a/modules/remoteprocessing/public/js/job/job.manage.js b/modules/remoteprocessing/public/js/job/job.manage.js index 202736038..6faad4493 100644 --- a/modules/remoteprocessing/public/js/job/job.manage.js +++ b/modules/remoteprocessing/public/js/job/job.manage.js @@ -26,13 +26,13 @@ function colorLines(checkHidden) { 'use strict'; var grey = false; $('.midasTree tr').each(function (index) { - $(this).css("border", "none"); + $(this).css('border', 'none'); if (index === 0) { return; } if (selectedJob == $(this).attr('element')) { - $(this).css("background-color", "#C0D1FE"); - $(this).css("border", "1px solid grey"); + $(this).css('background-color', '#C0D1FE'); + $(this).css('border', '1px solid grey'); grey = !grey; $(this).unbind('mouseenter mouseleave'); } diff --git a/modules/remoteprocessing/public/js/job/job.view.js b/modules/remoteprocessing/public/js/job/job.view.js index 928bfab3f..70ed0276f 100644 --- a/modules/remoteprocessing/public/js/job/job.view.js +++ b/modules/remoteprocessing/public/js/job/job.view.js @@ -16,7 +16,7 @@ $(document).ready(function () { $('#tableXml').dataTable(); $('.showInDialog').click(function () { - midas.showBigDialogWithContent('Output', '
      ' + $(this).attr('output').replace(/&/g, "&").replace(//g, ">") + '
      ', true); + midas.showBigDialogWithContent('Output', '
      ' + $(this).attr('output').replace(/&/g, '&').replace(//g, '>') + '
      ', true); }); initMetrics(); @@ -35,7 +35,7 @@ $(document).ready(function () { }); qtip.qtip('toggle', true); $.ajax({ - type: "POST", + type: 'POST', url: json.global.webroot + '/browse/getelementinfo', data: { type: 'item', @@ -74,11 +74,11 @@ function initMetrics() { max: max.toFixed(2), values: [0.00, max.toFixed(2)], slide: function (event, ui) { - $('#' + thisObj.attr('name') + '').html("" + (Math.round(ui.values[0] * 100) / 100) + " - " + (Math.round(ui.values[1] * 100) / 100) + ""); + $('#' + thisObj.attr('name') + '').html('' + (Math.round(ui.values[0] * 100) / 100) + ' - ' + (Math.round(ui.values[1] * 100) / 100) + ''); processXmlTableColors(); } }); - $('#' + $(this).attr('name') + '').html("0.00 - " + max.toFixed(2) + ""); + $('#' + $(this).attr('name') + '').html('0.00 - ' + max.toFixed(2) + ''); }); } diff --git a/modules/remoteprocessing/public/js/layout/remoteprocessing.js b/modules/remoteprocessing/public/js/layout/remoteprocessing.js index dca44133d..ebd22c2c5 100644 --- a/modules/remoteprocessing/public/js/layout/remoteprocessing.js +++ b/modules/remoteprocessing/public/js/layout/remoteprocessing.js @@ -17,7 +17,7 @@ $(document).ready(function () { } } else { midas.createNotice(json.login.contentUploadLogin, 4000); - $("div.TopDynamicBar").show('blind'); + $('div.TopDynamicBar').show('blind'); midas.loadAjaxDynamicBar('login', '/user/login'); } }); diff --git a/modules/sizequota/public/js/folder/folder.index.js b/modules/sizequota/public/js/folder/folder.index.js index b6e155793..27c7fb91e 100644 --- a/modules/sizequota/public/js/folder/folder.index.js +++ b/modules/sizequota/public/js/folder/folder.index.js @@ -4,8 +4,8 @@ var midas = midas || {}; midas.sizequota = midas.sizequota || {}; midas.sizequota.folder = midas.sizequota.folder || {}; midas.sizequota.constant = { - MIDAS_SIZEQUOTA_USE_DEFAULT_QUOTA: "0", - MIDAS_SIZEQUOTA_USE_SPECIFIC_QUOTA: "1" + MIDAS_SIZEQUOTA_USE_DEFAULT_QUOTA: '0', + MIDAS_SIZEQUOTA_USE_SPECIFIC_QUOTA: '1' }; midas.sizequota.folder.validateConfig = function (formData, jqForm, options) {}; @@ -17,7 +17,7 @@ midas.sizequota.folder.successConfig = function (responseText, statusText, xhr, jsonResponse = $.parseJSON(responseText); } catch (e) { - midas.createNotice("An error occured. Please check the logs.", 4000, 'error'); + midas.createNotice('An error occured. Please check the logs.', 4000, 'error'); return false; } if (jsonResponse === null) { diff --git a/modules/solr/public/js/advanced/advanced.index.js b/modules/solr/public/js/advanced/advanced.index.js index 6fc6df7c3..54e7ca553 100644 --- a/modules/solr/public/js/advanced/advanced.index.js +++ b/modules/solr/public/js/advanced/advanced.index.js @@ -72,13 +72,13 @@ midas.solr.fetchTypes = function () { ajaxWebApi.ajax({ method: 'midas.metadata.types.list', success: function (retVal) { - var typeCombo = $("#typeCombo"); + var typeCombo = $('#typeCombo'); var typeArray = retVal.data; var curType; var i; for (i = 0; i < typeArray.length; ++i) { curType = typeArray[i]; - typeCombo.append($('').attr("value", curType).text(curType)); + typeCombo.append($('').attr('value', curType).text(curType)); } typeCombo.change(function () { midas.solr.fetchElements($(this).val()); @@ -96,24 +96,24 @@ midas.solr.fetchElements = function (type) { 'use strict'; if (type === 'type') { $('#elementCombo').empty() - .append($('').attr("value", "element").text("Element")); + .append($('').attr('value', 'element').text('Element')); $('#qualifierCombo').empty() - .append($('').attr("value", "qualifier").text("Qualifier")); + .append($('').attr('value', 'qualifier').text('Qualifier')); return; } ajaxWebApi.ajax({ method: 'midas.metadata.elements.list', args: 'typename=' + type, success: function (retVal) { - var elementCombo = $("#elementCombo"); + var elementCombo = $('#elementCombo'); var elementArray = retVal.data; var curElement; var i; elementCombo.empty(); - elementCombo.append($('').attr("value", "element").text("Element")); + elementCombo.append($('').attr('value', 'element').text('Element')); for (i = 0; i < elementArray.length; ++i) { curElement = elementArray[i]; - elementCombo.append($('').attr("value", curElement).text(curElement)); + elementCombo.append($('').attr('value', curElement).text(curElement)); } elementCombo.change(function () { midas.solr.fetchQualifiers(type, $(this).val()); @@ -131,24 +131,24 @@ midas.solr.fetchQualifiers = function (type, element) { 'use strict'; if (type === 'type' || element === 'element') { $('#elementCombo').empty() - .append($('').attr("value", "element").text("Element")); + .append($('').attr('value', 'element').text('Element')); $('#qualifierCombo').empty() - .append($('').attr("value", "qualifier").text("Qualifier")); + .append($('').attr('value', 'qualifier').text('Qualifier')); return; } ajaxWebApi.ajax({ method: 'midas.metadata.qualifiers.list', args: 'typename=' + type + '&element=' + element, success: function (retVal) { - var qualifierCombo = $("#qualifierCombo"); + var qualifierCombo = $('#qualifierCombo'); var qualifierArray = retVal.data; var curQualifier; var i; qualifierCombo.empty(); - qualifierCombo.append($('').attr("value", "qualifier").text("Qualifier")); + qualifierCombo.append($('').attr('value', 'qualifier').text('Qualifier')); for (i = 0; i < qualifierArray.length; ++i) { curQualifier = qualifierArray[i]; - qualifierCombo.append($('').attr("value", curQualifier).text(curQualifier)); + qualifierCombo.append($('').attr('value', curQualifier).text(curQualifier)); } }, error: function (retVal) { diff --git a/modules/statistics/public/js/index/index.index.js b/modules/statistics/public/js/index/index.index.js index 207d2479f..03e5d4f21 100644 --- a/modules/statistics/public/js/index/index.index.js +++ b/modules/statistics/public/js/index/index.index.js @@ -6,10 +6,10 @@ var tabs; $(document).ready(function () { 'use strict'; - tabs = $("#tabsGeneric").tabs({ + tabs = $('#tabsGeneric').tabs({ select: function (event, ui) {} }); - $("#tabsGeneric").show(); + $('#tabsGeneric').show(); $('img.tabsLoading').hide(); var errors = json.stats.errors; $.each(errors, function (i, val) { @@ -65,7 +65,7 @@ $(document).ready(function () { plotAssetStores.push(plot); }); - $("#tabsGeneric").bind('tabsshow', function (event, ui) { + $('#tabsGeneric').bind('tabsshow', function (event, ui) { if (plotErrors._drawCount === 0) { plotErrors.replot(); } diff --git a/modules/statistics/public/js/item/item.index.js b/modules/statistics/public/js/item/item.index.js index 2526e4c0c..28eaec74a 100644 --- a/modules/statistics/public/js/item/item.index.js +++ b/modules/statistics/public/js/item/item.index.js @@ -1,6 +1,8 @@ // Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. +/* global google */ /* global json */ +/* global MarkerClusterer */ var midas = midas || {}; midas.statistics = midas.statistics || {}; @@ -52,7 +54,7 @@ midas.statistics.populateMap = function (responseText, statusText, xhr, form) { $('#filteredCount').html(html); } catch (e) { - alert("An error occured. Please check the logs."); + alert('An error occured. Please check the logs.'); return false; } finally { $('input.filterButton').removeAttr('disabled'); @@ -62,7 +64,7 @@ midas.statistics.populateMap = function (responseText, statusText, xhr, form) { $(document).ready(function () { 'use strict'; - var tabs = $("#tabsGeneric").tabs({ + var tabs = $('#tabsGeneric').tabs({ select: function (event, ui) {} }); $('#tabsGeneric').show(); @@ -109,19 +111,19 @@ $(document).ready(function () { midas.statistics.clusterer = new MarkerClusterer(midas.statistics.map, midas.statistics.mapMarkers); // Set up smart date picker widget logic - var dates = $("#startdate, #enddate").datepicker({ - defaultDate: "today", + var dates = $('#startdate, #enddate').datepicker({ + defaultDate: 'today', changeMonth: true, numberOfMonths: 1, onSelect: function (selectedDate) { - var option = this.id == "startdate" ? "minDate" : "maxDate"; - var instance = $(this).data("datepicker"); + var option = this.id == 'startdate' ? 'minDate' : 'maxDate'; + var instance = $(this).data('datepicker'); var date = $.datepicker.parseDate( instance.settings.dateFormat || $.datepicker._defaults.dateFormat, selectedDate, instance.settings); - dates.not(this).datepicker("option", option, date); + dates.not(this).datepicker('option', option, date); }, - dayNamesMin: ["S", "M", "T", "W", "T", "F", "S"] + dayNamesMin: ['S', 'M', 'T', 'W', 'T', 'F', 'S'] }); $('#downloadResultLimit').spinbox({ diff --git a/modules/tracker/public/js/producer/producer.edit.js b/modules/tracker/public/js/producer/producer.edit.js index fe823b819..394ffffed 100644 --- a/modules/tracker/public/js/producer/producer.edit.js +++ b/modules/tracker/public/js/producer/producer.edit.js @@ -31,9 +31,9 @@ $('form.editProducerForm').ajaxForm({ success: midas.tracker.editSuccess }); -midas.tracker.qtipContent = "Enter the URL that revision values in this producer will link to. " + - "Put %revision in the URL, and that will be expanded to the value of the revision." + - "

      Example: https:// github.com/myuser/myproject/commit/%revision

      "; +midas.tracker.qtipContent = 'Enter the URL that revision values in this producer will link to. ' + + 'Put %revision in the URL, and that will be expanded to the value of the revision.' + + '

      Example: https:// github.com/myuser/myproject/commit/%revision

      '; $.fn.qtip.zindex = 16000; // show qtip on top of the dialog instead of under it $('input[name="revisionUrl"]').qtip({ diff --git a/modules/tracker/public/js/producer/producer.view.js b/modules/tracker/public/js/producer/producer.view.js index 8b9c9b24e..a7936031c 100644 --- a/modules/tracker/public/js/producer/producer.view.js +++ b/modules/tracker/public/js/producer/producer.view.js @@ -29,7 +29,7 @@ $(document).ready(function () { $('img.deletingProducer').show(); $.post(json.global.webroot + '/tracker/producer/delete', { producerId: json.tracker.producer.producer_id - }, function (retVal) { + }, function (_) { // Use location.replace so we remove this page from back button history window.location.replace(json.global.webroot + '/community/' + encodeURIComponent(json.tracker.producer.community_id) + '#Trackers'); }); diff --git a/modules/tracker/public/js/scalar/scalar.details.js b/modules/tracker/public/js/scalar/scalar.details.js index 2c0877589..1ead05ec1 100644 --- a/modules/tracker/public/js/scalar/scalar.details.js +++ b/modules/tracker/public/js/scalar/scalar.details.js @@ -6,7 +6,7 @@ var midas = midas || {}; $('#deleteScalar').click(function () { 'use strict'; - var html = "Are you sure you want to delete this scalar value?"; + var html = 'Are you sure you want to delete this scalar value?'; html += '
      '; html += ''; html += ''; @@ -15,8 +15,8 @@ $('#deleteScalar').click(function () { midas.showDialogWithContent('Confirm delete scalar', html, false); $('#deleteScalarYes').click(function () { $.post(json.global.webroot + '/tracker/scalar/delete', { - scalarId: $('input.scalarIdChild').val() - }, + scalarId: $('input.scalarIdChild').val() + }, function (data) { var jsonResponse = $.parseJSON(data); if (jsonResponse === null) { diff --git a/modules/tracker/public/js/trend/trend.view.js b/modules/tracker/public/js/trend/trend.view.js index fc9454b60..d7d6a6841 100644 --- a/modules/tracker/public/js/trend/trend.view.js +++ b/modules/tracker/public/js/trend/trend.view.js @@ -147,7 +147,7 @@ midas.tracker.renderChartArea = function (curveData, first) { renderer: $.jqplot.DateAxisRenderer, tickRenderer: $.jqplot.CanvasAxisTickRenderer, tickOptions: { - formatString: "%Y-%m-%d", + formatString: '%Y-%m-%d', angle: 270, fontSize: '11px', labelPosition: 'middle', @@ -285,19 +285,19 @@ $(window).load(function () { } } - var dates = $("#startdate, #enddate").datepicker({ - defaultDate: "today", + var dates = $('#startdate, #enddate').datepicker({ + defaultDate: 'today', changeMonth: true, numberOfMonths: 1, onSelect: function (selectedDate) { - var option = this.id == "startdate" ? "minDate" : "maxDate"; - var instance = $(this).data("datepicker"); + var option = this.id == 'startdate' ? 'minDate' : 'maxDate'; + var instance = $(this).data('datepicker'); var date = $.datepicker.parseDate( instance.settings.dateFormat || $.datepicker._defaults.dateFormat, selectedDate, instance.settings); - dates.not(this).datepicker("option", option, date); + dates.not(this).datepicker('option', option, date); }, - dayNamesMin: ["S", "M", "T", "W", "T", "F", "S"] + dayNamesMin: ['S', 'M', 'T', 'W', 'T', 'F', 'S'] }); $('#startdate').val(json.tracker.initialStartDate); $('#enddate').val(json.tracker.initialEndDate); diff --git a/modules/visualize/public/js/image/image.index.js b/modules/visualize/public/js/image/image.index.js index 01604af6c..8248c0927 100644 --- a/modules/visualize/public/js/image/image.index.js +++ b/modules/visualize/public/js/image/image.index.js @@ -2,7 +2,7 @@ $(document).ready(function () { 'use strict'; - $("#viewer").iviewer({ + $('#viewer').iviewer({ src: $('div#urlImage').html(), update_on_resize: false }); diff --git a/modules/visualize/public/js/media/media.index.js b/modules/visualize/public/js/media/media.index.js index 2b73c0801..41fd244ef 100644 --- a/modules/visualize/public/js/media/media.index.js +++ b/modules/visualize/public/js/media/media.index.js @@ -4,42 +4,41 @@ $(document).ready(function () { 'use strict'; - json = $.parseJSON($('div.jsonContent').html()); if (json.type == 'mp3') { - $("#jquery_jplayer_1").jPlayer({ + $('#jquery_jplayer_1').jPlayer({ ready: function () { - $(this).jPlayer("setMedia", { - mp3: json.global.webroot + "/download?items=" + encodeURIComponent(json.itemId) + $(this).jPlayer('setMedia', { + mp3: json.global.webroot + '/download?items=' + encodeURIComponent(json.itemId) }); } }); } if (json.type == 'm4a') { - $("#jquery_jplayer_1").jPlayer({ + $('#jquery_jplayer_1').jPlayer({ ready: function () { - $(this).jPlayer("setMedia", { - m4a: json.global.webroot + "/download?items=" + encodeURIComponent(json.itemId) + $(this).jPlayer('setMedia', { + m4a: json.global.webroot + '/download?items=' + encodeURIComponent(json.itemId) }); }, - ended: function (event) { + ended: function (_) { }, - swfPath: json.global.moduleWebroot + "/public/js/jquery", - supplied: "m4a, oga" + swfPath: json.global.moduleWebroot + '/public/js/jquery', + supplied: 'm4a, oga' }); } if (json.type == 'm4v') { - $("#jquery_jplayer_1").jPlayer({ + $('#jquery_jplayer_1').jPlayer({ ready: function () { - $(this).jPlayer("setMedia", { - m4v: json.global.webroot + "/download?items=" + encodeURIComponent(json.itemId) + $(this).jPlayer('setMedia', { + m4v: json.global.webroot + '/download?items=' + encodeURIComponent(json.itemId) }); }, - ended: function (event) { - $(this).jPlayer("play"); + ended: function (_) { + $(this).jPlayer('play'); }, - swfPath: json.global.webroot + "/modules/visualize/public/js/jquery", - solution: "flash, html", - supplied: "m4v, ogv" + swfPath: json.global.webroot + '/modules/visualize/public/js/jquery', + solution: 'flash, html', + supplied: 'm4v, ogv' }); } }); diff --git a/modules/visualize/public/js/paraview/paraview.dual.js b/modules/visualize/public/js/paraview/paraview.dual.js index 1bc75e183..3e448528e 100644 --- a/modules/visualize/public/js/paraview/paraview.dual.js +++ b/modules/visualize/public/js/paraview/paraview.dual.js @@ -31,8 +31,7 @@ midas.visualize.start = function () { paraview.left.errorListener = { manageError: function (error) { if (error) { - midas.createNotice('A ParaViewWeb error occurred; check the console for information', 4000, 'error'); - console.log(error); + midas.createNotice('A ParaViewWeb error occurred.', 4000, 'error'); return false; } } @@ -42,8 +41,7 @@ midas.visualize.start = function () { paraview.right.errorListener = { manageError: function (error) { if (error) { - midas.createNotice('A ParaViewWeb error occurred; check the console for information', 4000, 'error'); - console.log(error); + midas.createNotice('A ParaViewWeb error occurred.', 4000, 'error'); return false; } } @@ -93,8 +91,6 @@ midas.visualize._dataOpened = function (side, retVal) { midas.visualize[side].midK = Math.floor((midas.visualize[side].bounds[4] + midas.visualize[side].bounds[5]) / 2.0); if (midas.visualize[side].bounds.length != 6) { - console.log('Invalid image bounds (' + side + ' image):'); - console.log(midas.visualize[side].bounds); return; } diff --git a/modules/visualize/public/js/paraview/paraview.slice.js b/modules/visualize/public/js/paraview/paraview.slice.js index 4232e4cd7..330a765bd 100644 --- a/modules/visualize/public/js/paraview/paraview.slice.js +++ b/modules/visualize/public/js/paraview/paraview.slice.js @@ -27,8 +27,7 @@ midas.visualize.start = function () { paraview.errorListener = { manageError: function (error) { if (error) { - midas.createNotice('A ParaViewWeb error occurred; check the console for information', 4000, 'error'); - console.log(error); + midas.createNotice('A ParaViewWeb error occurred.', 4000, 'error'); return false; } } @@ -62,8 +61,6 @@ midas.visualize._dataOpened = function (view, retVal) { midas.visualize.midK = Math.floor((midas.visualize.bounds[4] + midas.visualize.bounds[5]) / 2.0); if (midas.visualize.bounds.length != 6) { - console.log('Invalid image bounds:'); - console.log(midas.visualize.bounds); return; } diff --git a/modules/visualize/public/js/paraview/paraview.surface.js b/modules/visualize/public/js/paraview/paraview.surface.js index 843b69cb1..dc58f7a9c 100644 --- a/modules/visualize/public/js/paraview/paraview.surface.js +++ b/modules/visualize/public/js/paraview/paraview.surface.js @@ -24,8 +24,7 @@ midas.visualize.start = function () { paraview.errorListener = { manageError: function (error) { if (error) { - midas.createNotice('A ParaViewWeb error occurred; check the console for information', 4000, 'error'); - console.log(error); + midas.createNotice('A ParaViewWeb error occurred.', 4000, 'error'); return false; } } diff --git a/modules/visualize/public/js/paraview/paraview.volume.js b/modules/visualize/public/js/paraview/paraview.volume.js index a34e7f65d..e44d88862 100644 --- a/modules/visualize/public/js/paraview/paraview.volume.js +++ b/modules/visualize/public/js/paraview/paraview.volume.js @@ -23,8 +23,7 @@ midas.visualize.start = function () { paraview.errorListener = { manageError: function (error) { if (error) { - midas.createNotice('A ParaViewWeb error occurred; check the console for information', 4000, 'error'); - console.log(error); + midas.createNotice('A ParaViewWeb error occurred.', 4000, 'error'); return false; } } @@ -59,8 +58,6 @@ midas.visualize._dataOpened = function (view, retVal) { midas.visualize.midK = Math.floor((midas.visualize.bounds[4] + midas.visualize.bounds[5]) / 2.0); if (midas.visualize.bounds.length != 6) { - console.log('Invalid image bounds:'); - console.log(midas.visualize.bounds); return; } diff --git a/modules/visualize/public/js/wrapper/wrapper.index.js b/modules/visualize/public/js/wrapper/wrapper.index.js index b6a03fbb6..13a520bf3 100644 --- a/modules/visualize/public/js/wrapper/wrapper.index.js +++ b/modules/visualize/public/js/wrapper/wrapper.index.js @@ -15,7 +15,7 @@ function createInfoAjaxVisualize(itemId) { $('img.infoLoading').show(); $('div.ajaxInfoElement').html(''); $.ajax({ - type: "POST", + type: 'POST', url: json.global.webroot + '/browse/getelementinfo', data: { type: 'item', @@ -35,7 +35,7 @@ $(document).ready(function () { /** create preview page */ var height = $(window).height() - 100; var width = 800; - var url = json.global.webroot + "/visualize/?itemId=" + encodeURIComponent(json.item.item_id) + '&height=' + encodeURIComponent(height) + '&width=' + encodeURIComponent(width) + '&viewMode=' + encodeURIComponent(json.viewMode); + var url = json.global.webroot + '/visualize/?itemId=' + encodeURIComponent(json.item.item_id) + '&height=' + encodeURIComponent(height) + '&width=' + encodeURIComponent(width) + '&viewMode=' + encodeURIComponent(json.viewMode); var html = '
      '; html += '
      '; html += '
      '; @@ -69,7 +69,7 @@ $(document).ready(function () { $('#fullscreenVisualize').find('a.linkedcontentLink').click(function () { var height = $(window).height() - 100; var width = 900; - var url = json.global.webroot + "/visualize/?height=" + encodeURIComponent(height) + '&width=' + encodeURIComponent(width) + '&itemId=' + encodeURIComponent($(this).attr('element')); + var url = json.global.webroot + '/visualize/?height=' + encodeURIComponent(height) + '&width=' + encodeURIComponent(width) + '&itemId=' + encodeURIComponent($(this).attr('element')); $('iframe#fullscreenVisualizeIframe').attr('src', url); currentElement = $(this).attr('element'); highlightCurrentPreview(currentElement); @@ -93,7 +93,7 @@ $(document).ready(function () { var obj = $('#fullscreenVisualize').find('a.linkedcontentLink[element=' + currentElement + ']').parents('li').prev().find('a'); var height = $(window).height() - 100; var width = 900; - var url = json.global.webroot + "/visualize/?height=" + encodeURIComponent(height) + '&width=' + encodeURIComponent(width) + '&itemId=' + encodeURIComponent(obj.attr('element')); + var url = json.global.webroot + '/visualize/?height=' + encodeURIComponent(height) + '&width=' + encodeURIComponent(width) + '&itemId=' + encodeURIComponent(obj.attr('element')); $('iframe#fullscreenVisualizeIframe').attr('src', url); currentElement = obj.attr('element'); highlightCurrentPreview(currentElement); @@ -110,7 +110,7 @@ $(document).ready(function () { var obj = $('#fullscreenVisualize').find('a.linkedcontentLink[element=' + currentElement + ']').parents('li').next().find('a'); var height = $(window).height() - 100; var width = 900; - var url = json.global.webroot + "/visualize/?height=" + encodeURIComponent(height) + '&width=' + encodeURIComponent(width) + '&itemId=' + encodeURIComponent(obj.attr('element')); + var url = json.global.webroot + '/visualize/?height=' + encodeURIComponent(height) + '&width=' + encodeURIComponent(width) + '&itemId=' + encodeURIComponent(obj.attr('element')); $('iframe#fullscreenVisualizeIframe').attr('src', url); currentElement = obj.attr('element'); highlightCurrentPreview(currentElement); @@ -128,6 +128,6 @@ $(document).ready(function () { //$('.Header').hide(); $('.SubWrapper').hide(); $('#fullscreenVisualize').find('a.closeVisuButton').click(function () { - window.location.replace(json.global.webroot + "/item/" + encodeURIComponent(json.item.item_id)); + window.location.replace(json.global.webroot + '/item/' + encodeURIComponent(json.item.item_id)); }); }); From 25c4c0019d9e99e17af847b8fbfc4be5f5d35a5e Mon Sep 17 00:00:00 2001 From: Jamie Snape Date: Wed, 7 Oct 2015 17:56:26 -0400 Subject: [PATCH 3/5] Add scss-lint configuration --- .scss-lint.yml | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 .scss-lint.yml diff --git a/.scss-lint.yml b/.scss-lint.yml new file mode 100644 index 000000000..21a41f360 --- /dev/null +++ b/.scss-lint.yml @@ -0,0 +1,54 @@ +#============================================================================= +# Midas Server +# Copyright Kitware SAS, 26 rue Louis Guérin, 69100 Villeurbanne, France. +# All rights reserved. +# For more information visit http://www.kitware.com/. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0.txt +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +#============================================================================= + +--- +scss_files: '**/public/scss/*.scss' + +exclude: + - '**/public/**/*.css' + - 'core/public/scss/mixins/**' + - 'vendor/**' + +linters: + ColorVariable: + enabled: false + + HexNotation: + style: uppercase + + IdSelector: + enabled: false + + ImportantRule: + enabled: false + + Indentation: + width: 4 + + NestingDepth: + max_depth: 4 + + QualifyingElement: + enabled: false + + SelectorDepth: + max_depth: 4 + + SelectorFormat: + convention: camel_case From 5d7844ab12a7b6c3729fcb304a74046b164e5e30 Mon Sep 17 00:00:00 2001 From: Jamie Snape Date: Wed, 7 Oct 2015 17:56:47 -0400 Subject: [PATCH 4/5] Fix various scss-lint errors --- .scss-lint.yml | 1 + core/public/scss/admin/admin.dashboard.scss | 3 +- core/public/scss/admin/admin.index.scss | 12 +- core/public/scss/admin/admin.migrate.scss | 7 +- core/public/scss/admin/admin.upgrade.scss | 2 +- .../scss/assetstore/assetstore.add.scss | 8 +- .../assetstore/assetstore.movedialog.scss | 4 +- core/public/scss/browse/browse.index.scss | 13 +- core/public/scss/browse/browse.movecopy.scss | 7 +- .../scss/browse/browse.selectfolder.scss | 12 +- .../public/scss/browse/browse.selectitem.scss | 14 +- core/public/scss/common/common.browser.scss | 3 +- core/public/scss/common/common.feed.scss | 6 +- .../scss/common/common.genericPage.scss | 21 ++- core/public/scss/common/common.listfiles.scss | 4 +- .../scss/community/community.create.scss | 8 +- .../scss/community/community.index.scss | 5 +- .../scss/community/community.invitation.scss | 3 +- .../scss/community/community.manage.scss | 10 +- .../community/community.promotedialog.scss | 2 +- .../scss/community/community.selectgroup.scss | 2 +- .../public/scss/community/community.view.scss | 6 +- core/public/scss/error/error.error.scss | 3 +- core/public/scss/feed/feed.index.scss | 3 +- .../scss/folder/folder.createfolder.scss | 6 +- core/public/scss/folder/folder.edit.scss | 6 +- core/public/scss/folder/folder.view.scss | 4 +- core/public/scss/import/import.index.scss | 7 +- core/public/scss/install/install.scss | 2 +- core/public/scss/install/install.step2.scss | 3 +- core/public/scss/item/item.edit.scss | 8 +- core/public/scss/item/item.editbitstream.scss | 7 +- core/public/scss/item/item.editmetadata.scss | 6 +- core/public/scss/item/item.view.scss | 43 ++++-- core/public/scss/layout/form.scss | 56 ++++--- core/public/scss/layout/jquery.treeTable.scss | 114 +++++++++----- core/public/scss/layout/loginForm.scss | 27 +++- core/public/scss/layout/midas.empty.scss | 46 ++++-- core/public/scss/layout/midas.layout.scss | 141 +++++++++++++----- core/public/scss/layout/view.scss | 59 ++++++-- core/public/scss/licenses/licenses.index.scss | 2 +- core/public/scss/rest/rest.index.scss | 9 +- core/public/scss/search/search.index.scss | 8 +- core/public/scss/share/share.dialog.scss | 14 +- core/public/scss/share/share.links.scss | 16 +- core/public/scss/upload/upload.revision.scss | 12 +- .../scss/upload/upload.simpleupload.scss | 12 +- core/public/scss/user/user.deletedialog.scss | 3 +- core/public/scss/user/user.emailregister.scss | 3 +- core/public/scss/user/user.index.scss | 32 ++-- core/public/scss/user/user.manage.scss | 9 +- core/public/scss/user/user.register.scss | 26 +++- core/public/scss/user/user.settings.scss | 20 ++- core/public/scss/user/user.userpage.scss | 2 +- .../api/public/scss/index/index.index.scss | 2 +- .../public/scss/extract/extract.dialog.scss | 2 +- .../cleanup/public/scss/item/index.index.scss | 3 +- .../public/scss/item/item.comments.scss | 23 ++- .../community/community.agreementdialog.scss | 9 +- .../community/community.agreementtab.scss | 6 +- .../public/scss/upload/upload.index.scss | 2 +- .../public/scss/admin/admin.index.scss | 8 +- .../public/scss/download/download.index.scss | 4 +- .../public/scss/upload/upload.index.scss | 2 +- .../public/scss/upload/upload.revision.scss | 2 +- .../public/scss/item/keyfiles.item.view.scss | 2 +- .../mfa/public/scss/config/config.index.scss | 2 +- .../public/scss/config/config.usertab.scss | 2 +- .../mfa/public/scss/login/login.dialog.scss | 4 +- .../scss/authorize/authorize.index.scss | 23 ++- .../public/scss/client/client.index.scss | 13 +- .../packages.application.latest.scss | 10 +- .../packages.application.view.scss | 14 +- .../public/scss/package/package.manage.scss | 6 +- .../scss/view/packages.view.project.scss | 9 +- .../pvw/public/scss/admin/admin.status.scss | 5 +- .../public/scss/paraview/paraview.common.scss | 2 +- .../public/scss/paraview/paraview.slice.scss | 13 +- .../scss/paraview/paraview.surface.scss | 2 +- .../public/scss/paraview/paraview.volume.scss | 45 ++++-- .../public/scss/item/item.ratings.scss | 10 +- .../scss/executable/executable.define.scss | 10 +- .../public/scss/index/index.selectaction.scss | 5 +- .../public/scss/job/job.init.scss | 18 ++- .../public/scss/job/job.manage.scss | 2 +- .../public/scss/job/job.view.scss | 15 +- .../public/scss/layout/remoteprocessing.scss | 3 +- .../public/scss/folder/folder.index.scss | 2 +- .../solr/public/scss/admin/admin.index.scss | 4 +- .../public/scss/advanced/advanced.index.scss | 7 +- .../public/scss/index/index.index.scss | 3 +- .../public/scss/item/item.index.scss | 12 +- .../public/scss/admin/admin.index.scss | 2 +- .../scss/item/thumbnailcreator.item.view.scss | 3 +- .../public/scss/producer/producer.edit.scss | 2 +- .../public/scss/producer/producer.list.scss | 9 +- .../public/scss/producer/producer.view.scss | 16 +- .../public/scss/scalar/scalar.details.scss | 8 +- .../tracker/public/scss/trend/trend.edit.scss | 8 +- .../public/scss/trend/trend.notify.scss | 3 +- .../tracker/public/scss/trend/trend.view.scss | 31 ++-- .../public/scss/validation.index.scss | 14 +- .../public/scss/media/media.index.scss | 2 +- .../public/scss/paraview/paraview.dual.scss | 53 +++++-- .../public/scss/paraview/paraview.slice.scss | 13 +- .../scss/paraview/paraview.surface.scss | 2 +- .../public/scss/paraview/paraview.volume.scss | 45 ++++-- .../public/scss/webgl/webgl.index.scss | 38 +++-- .../public/scss/thing/thing.get.scss | 2 +- 109 files changed, 978 insertions(+), 441 deletions(-) diff --git a/.scss-lint.yml b/.scss-lint.yml index 21a41f360..1933224e5 100644 --- a/.scss-lint.yml +++ b/.scss-lint.yml @@ -23,6 +23,7 @@ scss_files: '**/public/scss/*.scss' exclude: - '**/public/**/*.css' - 'core/public/scss/mixins/**' + - 'library/SwaggerUI/**' - 'vendor/**' linters: diff --git a/core/public/scss/admin/admin.dashboard.scss b/core/public/scss/admin/admin.dashboard.scss index ab506d292..3bb81ec44 100644 --- a/core/public/scss/admin/admin.dashboard.scss +++ b/core/public/scss/admin/admin.dashboard.scss @@ -1,9 +1,10 @@ -/* Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. */ +// Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. .databaseIntegrityWrapper { border-top: 1px solid #D7D7D7; margin-top: 5px; padding-top: 10px; + ul { list-style-type: none; margin-left: 0; diff --git a/core/public/scss/admin/admin.index.scss b/core/public/scss/admin/admin.index.scss index dc4d6a24c..0bceaa4e4 100644 --- a/core/public/scss/admin/admin.index.scss +++ b/core/public/scss/admin/admin.index.scss @@ -1,28 +1,33 @@ -/* Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. */ +// Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. div { &.viewSideBar input.globalButton { margin-left: 0 !important; } + &.viewWrapper { padding-right: 40px !important; } + &.assetstoreElement { border-bottom: 1px solid #D0D0D0; margin-bottom: 10px; padding-bottom: 8px; } + &.assetstoreNameContainer { font-size: 14px; font-weight: bold; margin-bottom: 4px; } + &.assetstoreActions { margin-top: 5px; } } -.errorText, .freeSpaceWarning { +.errorText, +.freeSpaceWarning { color: #F00; } @@ -32,7 +37,8 @@ tr.moduleElementError td { } a { - &.moduleVisibleCategoryLink, &.moduleHiddenCategoryLink { + &.moduleVisibleCategoryLink, + &.moduleHiddenCategoryLink { font-size: 13px !important; font-weight: bold !important; } diff --git a/core/public/scss/admin/admin.migrate.scss b/core/public/scss/admin/admin.migrate.scss index f26a9804a..2494e45da 100644 --- a/core/public/scss/admin/admin.migrate.scss +++ b/core/public/scss/admin/admin.migrate.scss @@ -1,4 +1,4 @@ -/* Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. */ +// Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. h2 { margin-left: 10px; @@ -8,6 +8,7 @@ form.migrateForm dl { border: 0; margin-top: 25px; width: 800px; + dt { border-bottom: 1px solid #EEE; float: left; @@ -18,6 +19,7 @@ form.migrateForm dl { text-align: right; width: 200px; } + dd { border-bottom: 1px solid #EEE; display: inline; @@ -32,7 +34,8 @@ form.migrateForm dl { } } -#submit-label, #submit-element { +#submit-label, +#submit-element { border-bottom: 0; } diff --git a/core/public/scss/admin/admin.upgrade.scss b/core/public/scss/admin/admin.upgrade.scss index 4e6bc2083..976ff93a2 100644 --- a/core/public/scss/admin/admin.upgrade.scss +++ b/core/public/scss/admin/admin.upgrade.scss @@ -1,4 +1,4 @@ -/* Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. */ +// Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. div.viewSideBar input.globalButton { margin-left: 0 !important; diff --git a/core/public/scss/assetstore/assetstore.add.scss b/core/public/scss/assetstore/assetstore.add.scss index 2defeaa50..f7730c72c 100644 --- a/core/public/scss/assetstore/assetstore.add.scss +++ b/core/public/scss/assetstore/assetstore.add.scss @@ -1,16 +1,19 @@ -/* Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. */ +// Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. form.assetstoreForm { font-size: 12px; + dl { margin-top: 0; width: 250px; + dt { clear: both; font-weight: bold; margin-top: 5px; text-align: left; } + dd { border-bottom: 1px solid #EEE; margin-left: 0; @@ -27,6 +30,7 @@ form.assetstoreForm { display: none; } -dd.submit-element, #addassetstore-label { +dd.submit-element, +#addassetstore-label { border-bottom: 0; } diff --git a/core/public/scss/assetstore/assetstore.movedialog.scss b/core/public/scss/assetstore/assetstore.movedialog.scss index ad659afb4..426831c58 100644 --- a/core/public/scss/assetstore/assetstore.movedialog.scss +++ b/core/public/scss/assetstore/assetstore.movedialog.scss @@ -1,8 +1,8 @@ -/* Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. */ +// Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. div.bottomButtons { - margin-top: 15px; float: right; + margin-top: 15px; } #moveBitstreamsProgressBar { diff --git a/core/public/scss/browse/browse.index.scss b/core/public/scss/browse/browse.index.scss index 0ffc0cf85..8b7b4b2a2 100644 --- a/core/public/scss/browse/browse.index.scss +++ b/core/public/scss/browse/browse.index.scss @@ -1,9 +1,12 @@ -/* Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. */ +// Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. div { - &.viewAction, &.viewInfo, &.ajaxInfoElement { + &.viewAction, + &.viewInfo, + &.ajaxInfoElement { display: none; } + &.feedThumbnail img { display: none; height: 31px; @@ -21,20 +24,24 @@ div { &.feedThumbnail a { border: 0; } + &.itemList span { padding-left: 15px; } + &.itemBlock { border-bottom: 1px dotted #808080; padding-bottom: 5px; padding-top: 5px; + &:hover { background-color: #F6F9FE; cursor: pointer; } } + &.itemStats { - border: none; + border: 0; color: #777; float: right; font-size: 10px; diff --git a/core/public/scss/browse/browse.movecopy.scss b/core/public/scss/browse/browse.movecopy.scss index 79f62c4a6..e3b11d239 100644 --- a/core/public/scss/browse/browse.movecopy.scss +++ b/core/public/scss/browse/browse.movecopy.scss @@ -1,12 +1,13 @@ -/* Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. */ +// Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. table#moveCopyTable { + display: none; width: 420px !important; + th.thData { border-right: none !important; width: auto !important; } - display: none; } #moveCopyTable .browserPrivacyInformation { @@ -22,10 +23,12 @@ div { float: right; margin-top: 10px; } + &.copySymlinkSelect { margin-bottom: 8px; padding-top: 6px; } + &.destinationDisplay { margin-bottom: 8px; } diff --git a/core/public/scss/browse/browse.selectfolder.scss b/core/public/scss/browse/browse.selectfolder.scss index 254017575..e916c188b 100644 --- a/core/public/scss/browse/browse.selectfolder.scss +++ b/core/public/scss/browse/browse.selectfolder.scss @@ -1,12 +1,13 @@ -/* Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. */ +// Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. table#moveTable { + display: none; width: 420px !important; + th.thData { border-right: none !important; width: auto !important; } - display: none; } #moveTable .browserPrivacyInformation { @@ -14,21 +15,20 @@ table#moveTable { } #createFolderButton { - border: none; + border: 0; display: none; float: none !important; width: 200px; } #createFolderContent { - border-radius: 6px; border: 1px #CCD7E0 dotted !important; - border: 1px #354856 solid; + border-radius: 6px; box-shadow: 0 0 2px #666; display: none; margin-bottom: 2px; margin-top: 5px; - padding: 0 5px 6px 5px; + padding: 0 5px 6px; width: 300px; } diff --git a/core/public/scss/browse/browse.selectitem.scss b/core/public/scss/browse/browse.selectitem.scss index 2a49a71ba..48a07bde4 100644 --- a/core/public/scss/browse/browse.selectitem.scss +++ b/core/public/scss/browse/browse.selectitem.scss @@ -1,12 +1,13 @@ -/* Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. */ +// Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. table#moveTable { + display: none; width: 420px !important; + th.thData { border-right: none !important; width: auto !important; } - display: none; } .treeTable .browserPrivacyInformation { @@ -17,6 +18,7 @@ div { &.selectedItemContainer { margin-bottom: 5px; } + &.bottomButtons { float: right; margin-top: 10px; @@ -24,18 +26,18 @@ div { } input#live_search_item { - background: #FFF url(../../images/icons/search.png) no-repeat scroll 2px 1px; - border-radius: 4px; + background: #FFF url('../../images/icons/search.png') no-repeat scroll 2px 1px; border: 1px solid #FFF; + border-radius: 4px; box-shadow: 0 0 3px #666; font-size: 12px; - opacity: 0.9; + opacity: .9; padding: 2px 10px 2px 22px; width: 260px; } #searchloadingSelectItem { - background: url("../../images/icons/loading-small.gif") bottom center no-repeat; + background: url('../../images/icons/loading-small.gif') bottom center no-repeat; color: #FFF; display: inline-block; height: 16px; diff --git a/core/public/scss/common/common.browser.scss b/core/public/scss/common/common.browser.scss index 9023dce96..586cb0f40 100644 --- a/core/public/scss/common/common.browser.scss +++ b/core/public/scss/common/common.browser.scss @@ -1,4 +1,4 @@ -/* Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. */ +// Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. span.infoTitle { font-weight: bold; @@ -9,6 +9,7 @@ input { &.deleteSelectedYes { margin-left: 0 !important; } + &.deleteSelectedNo { margin-left: 15px !important; } diff --git a/core/public/scss/common/common.feed.scss b/core/public/scss/common/common.feed.scss index e045b8993..05ef6ad94 100644 --- a/core/public/scss/common/common.feed.scss +++ b/core/public/scss/common/common.feed.scss @@ -1,4 +1,4 @@ -/* Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. */ +// Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. div.feedContainer div { &.feedElement { @@ -6,9 +6,11 @@ div.feedContainer div { min-height: 30px; position: relative; } + &.feedUserImage { float: left; } + &.feedDate { bottom: 0; color: #808080; @@ -37,7 +39,7 @@ div.feedDelete { img.newFeedElement { float: right; - position: relative; left: -13px; + position: relative; top: 2px; } diff --git a/core/public/scss/common/common.genericPage.scss b/core/public/scss/common/common.genericPage.scss index 4e3369e05..d6db43db0 100644 --- a/core/public/scss/common/common.genericPage.scss +++ b/core/public/scss/common/common.genericPage.scss @@ -1,45 +1,56 @@ -/* Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. */ +// Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. div { &.tabs { display: none; } + &.genericThumbnail { float: left; } + &.genericInfo { height: 40px; } + &.genericAction { border-bottom: 1px solid #FFF; padding-bottom: 10px; + ul { list-style: none; margin: 0; padding: 0; } } + &.genericCommunities { + border-bottom: 1px solid #FFF; + border-top: 1px solid #DAD8D4; + padding-bottom: 10px; + ul { list-style: none; margin: 0; padding: 0; } - border-bottom: 1px solid #FFF; - border-top: 1px solid #DAD8D4; - padding-bottom: 10px; } + &.genericStats { border-top: 1px solid #DAD8D4; } - &.viewAction, &.viewInfo { + + &.viewAction, + &.viewInfo { display: none; } + &.genericInfo { .genericName { font-size: 16px; font-weight: bold; } + .genericSubtitle { font-weight: bold; } diff --git a/core/public/scss/common/common.listfiles.scss b/core/public/scss/common/common.listfiles.scss index a10895774..234725ab0 100644 --- a/core/public/scss/common/common.listfiles.scss +++ b/core/public/scss/common/common.listfiles.scss @@ -1,4 +1,4 @@ -/* Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. */ +// Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. div.listFilesContainer div { &.fileElement { @@ -6,6 +6,7 @@ div.listFilesContainer div { min-height: 30px; position: relative; } + &.fileDate { bottom: 0; color: #808080; @@ -13,6 +14,7 @@ div.listFilesContainer div { position: absolute; right: 0; } + &.feedUserImage { float: left; } diff --git a/core/public/scss/community/community.create.scss b/core/public/scss/community/community.create.scss index 407a4b4c0..e662390dc 100644 --- a/core/public/scss/community/community.create.scss +++ b/core/public/scss/community/community.create.scss @@ -1,23 +1,27 @@ -/* Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. */ +// Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. form#createCommunityForm { label { width: 100px !important; } + div.radioElement { label { float: inherit !important; width: 400px !important; } + ul { list-style: none; margin: 0 0 0 100px; - padding: 0 0 0 0; + padding: 0; width: 300px !important; } + br { display: none; } + h4 { margin-bottom: 4px; } diff --git a/core/public/scss/community/community.index.scss b/core/public/scss/community/community.index.scss index dc8bdf70e..f6acf3f4b 100644 --- a/core/public/scss/community/community.index.scss +++ b/core/public/scss/community/community.index.scss @@ -1,4 +1,4 @@ -/* Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. */ +// Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. div { &.communityList { @@ -7,14 +7,17 @@ div { padding-bottom: 5px; padding-top: 5px; } + a.communityTitle { font-size: 14px; font-weight: bold; } + span { padding-left: 15px; } } + &.communityBlock:hover { background-color: #F6F9FE; cursor: pointer; diff --git a/core/public/scss/community/community.invitation.scss b/core/public/scss/community/community.invitation.scss index 4e8fafe50..8c091dd88 100644 --- a/core/public/scss/community/community.invitation.scss +++ b/core/public/scss/community/community.invitation.scss @@ -1,4 +1,4 @@ -/* Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. */ +// Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. input#urlInput { width: 300px; @@ -9,6 +9,7 @@ div#permissionsContent a { cursor: pointer; font-weight: 500; text-decoration: none; + &:hover { text-decoration: underline; } diff --git a/core/public/scss/community/community.manage.scss b/core/public/scss/community/community.manage.scss index e090cdd44..c2b369780 100644 --- a/core/public/scss/community/community.manage.scss +++ b/core/public/scss/community/community.manage.scss @@ -1,19 +1,22 @@ -/* Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. */ +// Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. div.radioElement { label { float: inherit !important; width: 600px !important; } + ul { list-style: none; margin: 0 0 0 100px; - padding: 0 0 0 0; + padding: 0; width: 600px !important; } + h4 { margin-bottom: 4px; } + br { display: none; } @@ -24,8 +27,8 @@ img.folderLoading { } h1 { - padding: .2em; margin: 0; + padding: .2em; } #products { @@ -37,6 +40,7 @@ h1 { #cart { float: left; width: 200px; + ol { margin: 0; padding: 1em 0 1em 3em; diff --git a/core/public/scss/community/community.promotedialog.scss b/core/public/scss/community/community.promotedialog.scss index 239205ed1..45f220958 100644 --- a/core/public/scss/community/community.promotedialog.scss +++ b/core/public/scss/community/community.promotedialog.scss @@ -1,4 +1,4 @@ -/* Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. */ +// Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. input.addToGroupsSubmit { float: right; diff --git a/core/public/scss/community/community.selectgroup.scss b/core/public/scss/community/community.selectgroup.scss index 04f75a405..8a2849ed8 100644 --- a/core/public/scss/community/community.selectgroup.scss +++ b/core/public/scss/community/community.selectgroup.scss @@ -1,4 +1,4 @@ -/* Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. */ +// Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. div.bottomButtons { float: right; diff --git a/core/public/scss/community/community.view.scss b/core/public/scss/community/community.view.scss index f6642d53f..8efe9da39 100644 --- a/core/public/scss/community/community.view.scss +++ b/core/public/scss/community/community.view.scss @@ -1,4 +1,4 @@ -/* Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. */ +// Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. @import 'bourbon'; @@ -15,10 +15,12 @@ div { &.genericInfo .genericSubtitle { font-weight: normal; } + &.genericBigButton input { @include linear-gradient(to bottom, #FFF, #C4C4C4); - border: none; + border: 0; cursor: pointer; + &:hover { @include linear-gradient(to bottom, #BDDCC9, #8AB79B); } diff --git a/core/public/scss/error/error.error.scss b/core/public/scss/error/error.error.scss index 46557e0be..1a085a3e1 100644 --- a/core/public/scss/error/error.error.scss +++ b/core/public/scss/error/error.error.scss @@ -1,10 +1,11 @@ -/* Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. */ +// Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. div { &.errorMessage { margin-bottom: 10px; margin-top: 5px; } + &.exceptionText { margin-top: 20px; } diff --git a/core/public/scss/feed/feed.index.scss b/core/public/scss/feed/feed.index.scss index aee136be6..6ed496a97 100644 --- a/core/public/scss/feed/feed.index.scss +++ b/core/public/scss/feed/feed.index.scss @@ -1,4 +1,4 @@ -/* Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. */ +// Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. div.feedThumbnail { img { @@ -7,6 +7,7 @@ div.feedThumbnail { margin-right: 4px; width: 31px; } + a { border: 0; } diff --git a/core/public/scss/folder/folder.createfolder.scss b/core/public/scss/folder/folder.createfolder.scss index b9f36a05f..607a734e8 100644 --- a/core/public/scss/folder/folder.createfolder.scss +++ b/core/public/scss/folder/folder.createfolder.scss @@ -1,11 +1,13 @@ -/* Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. */ +// Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. form#editFolderForm { input { - &[type="text"], &[type="password"] { + &[type='text'], + &[type='password'] { width: 350px !important; } } + textarea { width: 350px !important; } diff --git a/core/public/scss/folder/folder.edit.scss b/core/public/scss/folder/folder.edit.scss index b9f36a05f..607a734e8 100644 --- a/core/public/scss/folder/folder.edit.scss +++ b/core/public/scss/folder/folder.edit.scss @@ -1,11 +1,13 @@ -/* Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. */ +// Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. form#editFolderForm { input { - &[type="text"], &[type="password"] { + &[type='text'], + &[type='password'] { width: 350px !important; } } + textarea { width: 350px !important; } diff --git a/core/public/scss/folder/folder.view.scss b/core/public/scss/folder/folder.view.scss index 742d5b7bb..3356fb641 100644 --- a/core/public/scss/folder/folder.view.scss +++ b/core/public/scss/folder/folder.view.scss @@ -1,12 +1,14 @@ -/* Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. */ +// Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. div { &.defaultSideTrigger { display: none; } + &.viewInfo { display: inherit !important; } + &.genericBigButton { position: relative; top: -20px; diff --git a/core/public/scss/import/import.index.scss b/core/public/scss/import/import.index.scss index a330b40bd..6abc0daa6 100644 --- a/core/public/scss/import/import.index.scss +++ b/core/public/scss/import/import.index.scss @@ -1,9 +1,10 @@ -/* Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. */ +// Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. form.importForm dl { border: 0; margin-top: 25px; width: 800px; + dt { border-bottom: 1px solid #EEE; float: left; @@ -14,6 +15,7 @@ form.importForm dl { text-align: right; width: 200px; } + dd { border-bottom: 1px solid #EEE; display: inline; @@ -28,7 +30,8 @@ form.importForm dl { } } -#submit-label, #submit-element { +#submit-label, +#submit-element { border-bottom: 0; } diff --git a/core/public/scss/install/install.scss b/core/public/scss/install/install.scss index e0bfa343e..42725c576 100644 --- a/core/public/scss/install/install.scss +++ b/core/public/scss/install/install.scss @@ -1,4 +1,4 @@ -/* Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. */ +// Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. div.viewWrapper { padding-right: 40px !important; diff --git a/core/public/scss/install/install.step2.scss b/core/public/scss/install/install.step2.scss index 964f6feba..4ed4effdf 100644 --- a/core/public/scss/install/install.step2.scss +++ b/core/public/scss/install/install.step2.scss @@ -1,4 +1,4 @@ -/* Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. */ +// Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. .dbForm { display: none; @@ -6,6 +6,7 @@ #dbResult { position: relative; + div { height: 30px; margin-left: 203px; diff --git a/core/public/scss/item/item.edit.scss b/core/public/scss/item/item.edit.scss index d06d65604..71def85d9 100644 --- a/core/public/scss/item/item.edit.scss +++ b/core/public/scss/item/item.edit.scss @@ -1,11 +1,13 @@ -/* Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. */ +// Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. form#editItemForm { input { - &[type="text"], &[type="password"] { + &[type='text'], + &[type='password'] { width: 350px !important; } } + textarea { width: 350px !important; } @@ -13,8 +15,8 @@ form#editItemForm { div.updateBitstreamNameNotice { background-color: #CDD; - border-radius: 4px; border: 2px solid #ACC; + border-radius: 4px; margin-bottom: 5px; padding: 8px; } diff --git a/core/public/scss/item/item.editbitstream.scss b/core/public/scss/item/item.editbitstream.scss index d0f6e25ca..c826ca4b7 100644 --- a/core/public/scss/item/item.editbitstream.scss +++ b/core/public/scss/item/item.editbitstream.scss @@ -1,10 +1,11 @@ -/* Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. */ +// Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. form#editBitstreamForm input { - &[type="text"] { + &[type='text'] { width: 350px !important; } - &[type="submit"] { + + &[type='submit'] { margin: 0 150px !important; } } diff --git a/core/public/scss/item/item.editmetadata.scss b/core/public/scss/item/item.editmetadata.scss index 947f96526..973f89e57 100644 --- a/core/public/scss/item/item.editmetadata.scss +++ b/core/public/scss/item/item.editmetadata.scss @@ -1,11 +1,13 @@ -/* Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. */ +// Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. form#editItemForm { input { - &[type="text"], &[type="password"] { + &[type='text'], + &[type='password'] { width: 350px !important; } } + textarea { width: 350px !important; } diff --git a/core/public/scss/item/item.view.scss b/core/public/scss/item/item.view.scss index 908ecca74..0ff331a5b 100644 --- a/core/public/scss/item/item.view.scss +++ b/core/public/scss/item/item.view.scss @@ -1,9 +1,10 @@ -/* Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. */ +// Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. @import 'bourbon'; div { - &.viewAction, &.viewInfo { + &.viewAction, + &.viewInfo { display: block !important; } } @@ -12,12 +13,15 @@ table { &.bitstreamList { display: table !important; } + &#metadataTable { display: table !important; table-layout: fixed; + th.elementHeader { width: 6em; } + td { overflow: hidden; text-overflow: ellipsis; @@ -28,6 +32,7 @@ table { div.genericInfo { position: relative; + .genericSubtitle { font-size: 10px; } @@ -39,15 +44,17 @@ iframe#fullscreenVisualizeIframe { div#fullscreenPanel { background-color: #FFF; - border-radius: 6px; border: 1px solid #D7D7D7; + border-radius: 6px; box-shadow: 0 0 6px #CCC; float: right; padding: 0 0 7px; width: 380px; + h1 { font-size: 14px; } + ul { list-style: none; margin: 0; @@ -68,6 +75,7 @@ span.manageMetadata { h3 a { text-decoration: none; } + a img { float: left; margin-right: 2px; @@ -79,32 +87,36 @@ span.manageMetadata { top: 3px; } -#licenseDiv {} - div.itemViewMainSection { border-top: 1px solid #D7D7D7; margin-bottom: 14px; + h4 { color: #999; font-size: 11px; - margin-bottom: 0.67em; - margin-top: 0.67em; + margin-bottom: .67em; + margin-top: .67em; text-shadow: #FFF 0 1px 1px; text-transform: uppercase; } } table { - &.bitstreamList, &.metadataList { + &.bitstreamList, + &.metadataList { border-collapse: collapse; border-spacing: 0; width: 100%; } - &.bitstreamList th, &.metadataList th { + + &.bitstreamList th, + &.metadataList th { background-color: #D0D0F6; border: 1px solid #808080; } - &.bitstreamList td, &.metadataList td { + + &.bitstreamList td, + &.metadataList td { border: 1px solid #B5B5B5; } } @@ -120,23 +132,26 @@ img { cursor: pointer; float: none; } - &.deleteBitstreamIcon, &.bitstreamInfoIcon { + + &.deleteBitstreamIcon, + &.bitstreamInfoIcon { cursor: pointer; float: right; } } button.topDownloadButton { - @include linear-gradient(to bottom, #4499CC, #4466AA); - border-radius: 6px; + @include linear-gradient(to bottom, #49C, #46A); border: #354856 1px solid; + border-radius: 6px; color: #FFF; cursor: pointer; font-size: 14px; font-weight: bold; height: 35px; width: 100px; + &:hover { - @include linear-gradient(to bottom, #227777, #224444); + @include linear-gradient(to bottom, #277, #244); } } diff --git a/core/public/scss/layout/form.scss b/core/public/scss/layout/form.scss index 69a60deb1..36470983b 100644 --- a/core/public/scss/layout/form.scss +++ b/core/public/scss/layout/form.scss @@ -1,4 +1,4 @@ -/* Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. */ +// Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. @import 'bourbon'; @@ -10,9 +10,11 @@ form.genericForm { text-align: right; width: 200px; } + input { - &[type=submit], &[type=button] { - background: #F6F9FE url(images/ui-bg_glass_85_f6f9fe_1x400.png) repeat-x 50% 50%; + &[type=submit], + &[type=button] { + background: #F6F9FE url('images/ui-bg_glass_85_f6f9fe_1x400.png') repeat-x 50% 50%; border: 1px solid #808080; -moz-box-align: center; -webkit-box-align: center; @@ -23,19 +25,23 @@ form.genericForm { font-weight: bold; line-height: 1.4; margin-left: 116px; - margin-right: 0.1em; + margin-right: .1em; overflow: visible; position: relative; text-align: center; text-decoration: none !important; zoom: 1; } - &[type=submit]:hover, &[type=button]:hover { + + &[type=submit]:hover, + &[type=button]:hover { background: #CBD9E3 none; color: #1D5987; text-decoration: none; } - &[type=submit][disabled], &[type=button][disabled] { + + &[type=submit][disabled], + &[type=button][disabled] { background: #DBDBDB none; color: #808080; cursor: default; @@ -52,9 +58,10 @@ form.genericForm { } form.genericForm input { - &[type=submit][disabled]:hover, &[type=button][disabled]:hover { - background-image: none; + &[type=submit][disabled]:hover, + &[type=button][disabled]:hover { background: #DBDBDB !important; + background-image: none; color: #808080 !important; cursor: default; text-decoration: none; @@ -62,8 +69,8 @@ form.genericForm input { } .globalButton[disabled]:hover { - background-image: none; background: #DBDBDB !important; + background-image: none; color: #808080 !important; cursor: default; text-decoration: none; @@ -77,8 +84,10 @@ form.genericForm { text-align: left; width: 200px; } + input { - &[type=text], &[type=password] { + &[type=text], + &[type=password] { background: #F3F1EC; border: 1px solid #808080; color: #000; @@ -86,6 +95,7 @@ form.genericForm { margin-right: 10px; } } + textarea { background: #F3F1EC; border: 1px solid #808080; @@ -93,25 +103,32 @@ form.genericForm { height: 18px; margin-right: 10px; } + input { - &[type=text], &[type=password] { + &[type=text], + &[type=password] { width: 250px; } } + textarea { - width: 247px; height: 35px; + width: 247px; } + input { - &[type=text]:hover, &[type=password]:hover { + &[type=text]:hover, + &[type=password]:hover { background: #FFF; } } + textarea:hover { background: #FFF; } + div input[type=submit] { - background: #F6F9FE url(images/ui-bg_glass_85_f6f9fe_1x400.png) repeat-x 50% 50%; + background: #F6F9FE url('images/ui-bg_glass_85_f6f9fe_1x400.png') repeat-x 50% 50%; border: 1px solid #808080; -moz-box-align: center; -webkit-box-align: center; @@ -123,7 +140,7 @@ form.genericForm { font-weight: bold; line-height: 1.4; margin-left: 208px; - margin-right: 0.1em; + margin-right: .1em; overflow: visible; position: relative; text-align: center; @@ -133,7 +150,7 @@ form.genericForm { } input.globalButton { - background: #F6F9FE url(images/ui-bg_glass_85_f6f9fe_1x400.png) repeat-x 50% 50%; + background: #F6F9FE url('images/ui-bg_glass_85_f6f9fe_1x400.png') repeat-x 50% 50%; border: 1px solid #808080; -moz-box-align: center; -webkit-box-align: center; @@ -145,7 +162,7 @@ input.globalButton { font-weight: bold; line-height: 1.4; margin-left: 208px; - margin-right: 0.1em; + margin-right: .1em; overflow: visible; position: relative; text-align: center; @@ -155,7 +172,7 @@ input.globalButton { form.genericForm input { &[type=button] { - background: #F6F9FE url(images/ui-bg_glass_85_f6f9fe_1x400.png) repeat-x 50% 50%; + background: #F6F9FE url('images/ui-bg_glass_85_f6f9fe_1x400.png') repeat-x 50% 50%; border: 1px solid #808080; -moz-box-align: center; -webkit-box-align: center; @@ -167,13 +184,14 @@ form.genericForm input { font-weight: bold; line-height: 1.4; margin-left: 208px; - margin-right: 0.1em; + margin-right: .1em; overflow: visible; position: relative; text-align: center; text-decoration: none !important; zoom: 1; } + &[type=submit]:hover { background: #CBD9E3 none; color: #1D5987; diff --git a/core/public/scss/layout/jquery.treeTable.scss b/core/public/scss/layout/jquery.treeTable.scss index a7ca3f929..49e57ba58 100644 --- a/core/public/scss/layout/jquery.treeTable.scss +++ b/core/public/scss/layout/jquery.treeTable.scss @@ -1,4 +1,4 @@ -/* Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. */ +// Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. @import 'bourbon'; @@ -11,33 +11,42 @@ padding: 0; zoom: 1; } + &.collapsed td .expander { - background-image: url(../../images/TreeTable/toggle-expand-dark.png); + background-image: url('../../images/TreeTable/toggle-expand-dark.png'); } + &.expanded td .expander { - background-image: url(../../images/TreeTable/toggle-collapse-dark.png); + background-image: url('../../images/TreeTable/toggle-collapse-dark.png'); } } + span.elementSize { - padding: 0px !important; + padding: 0 !important; } + tr { - &.selected, &.accept { + &.selected, + &.accept { background-color: #C0D1FE !important; border: 1px solid #808080; } - &.selected td {} + &.collapsed { - &.selected td .expander, &.accept td .expander { - background-image: url(../../images/TreeTable/toggle-expand-dark.png); + &.selected td .expander, + &.accept td .expander { + background-image: url('../../images/TreeTable/toggle-expand-dark.png'); } } + &.expanded { - &.selected td .expander, &.accept td .expander { - background-image: url(../../images/TreeTable/toggle-collapse-dark.png); + &.selected td .expander, + &.accept td .expander { + background-image: url('../../images/TreeTable/toggle-collapse-dark.png'); } } } + .ui-draggable-dragging { color: #000; z-index: 1; @@ -45,50 +54,61 @@ } table.midasTree { - width: 580px; - display: none; @include user-select(none); border-collapse: collapse; + display: none; + width: 580px; + thead th { - font-family: $lucida-grande; - font-size: 8pt; - color: #000; background-color: #E6EEEE; + background-position: center right; + background-repeat: no-repeat; border: 1px solid #AAA; + color: #000; + font-family: $lucida-grande; + font-size: 8pt; padding: 3px; - background-repeat: no-repeat; - background-position: center right; + &.thData { - padding-left: 10px; + background-image: url('images/asc.gif'); cursor: pointer; - background-image: url(images/asc.gif); + padding-left: 10px; } + &.thDate { - width: 15%; - padding-left: 10px; + background-image: url('images/bg.gif'); cursor: pointer; - background-image: url(images/bg.gif); + padding-left: 10px; + width: 15%; } + &.thSize { - width: 14%; - padding-left: 10px; + background-image: url('images/bg.gif'); cursor: pointer; - background-image: url(images/bg.gif); + padding-left: 10px; + width: 14%; } } + th { &.sortasc { - background-image: url(images/asc.gif) !important; + background-image: url('images/asc.gif') !important; } + &.sortdesc { - background-image: url(images/desc.gif) !important; + background-image: url('images/desc.gif') !important; } + &.sortnone { - background-image: url(images/bg.gif) !important; + background-image: url('images/bg.gif') !important; } - &.thSize:hover, &.thData:hover, &.thDate:hover { - background-color: #CCDDDD; + + &.thSize:hover, + &.thData:hover, + &.thDate:hover { + background-color: #CDD; } + &.thCheckbox { width: 20px; } @@ -96,10 +116,10 @@ table.midasTree { } #browseTableHeaderCheckbox { - margin-top: 2px; margin-bottom: 2px; margin-left: 3px; margin-right: 3px; + margin-top: 2px; } table.midasTree { @@ -108,51 +128,65 @@ table.midasTree { cursor: default; padding-left: 3px; } + tr { border-bottom: 1px #CCD7E0 dotted; + &:hover { background-color: #F3F1EC; } } + tbody tr { td.treeBrowseElement { - padding-left: 1.5em !important; cursor: pointer; + padding-left: 1.5em !important; } + &.even { background: #F3F3F3; } + &.odd { background: #FFF; } } + span { background-position: center left; background-repeat: no-repeat; padding: .2em 0 .2em 1.5em; + &.file { - background-image: url(../../images/TreeTable/page_white_text.png); + background-image: url('../../images/TreeTable/page_white_text.png'); } + &.filePrivate { - background-image: url(../../images/TreeTable/page_white_text_private.png); + background-image: url('../../images/TreeTable/page_white_text_private.png'); } + &.filePublic { - background-image: url(../../images/TreeTable/page_white_text_world.png); + background-image: url('../../images/TreeTable/page_white_text_world.png'); } + &.folder { - background-image: url(../../images/TreeTable/folder.png); + background-image: url('../../images/TreeTable/folder.png'); } + &.folderPrivate { - background-image: url(../../images/TreeTable/folder_private.png); + background-image: url('../../images/TreeTable/folder_private.png'); } + &.folderPublic { - background-image: url(../../images/TreeTable/folder_world.png); + background-image: url('../../images/TreeTable/folder_world.png'); } + &.loading { - background-image: url(../../images/icons/loading.gif); + background-image: url('../../images/icons/loading.gif'); } + &.community { - background-image: url(../../images/icons/community.png); + background-image: url('../../images/icons/community.png'); } } } diff --git a/core/public/scss/layout/loginForm.scss b/core/public/scss/layout/loginForm.scss index e2642ee39..3037d02a5 100644 --- a/core/public/scss/layout/loginForm.scss +++ b/core/public/scss/layout/loginForm.scss @@ -1,4 +1,4 @@ -/* Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. */ +// Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. form#loginForm { color: #FFF; @@ -7,23 +7,29 @@ form#loginForm { position: relative; top: 13px; width: 600px; + div { &.loginError { color: #57BB7D; position: absolute; top: -15px; - span, img { + + span, + img { display: none; position: relative; } } + display: inline; + &.rememberMe { float: right; left: -453px; position: relative; top: 20px; } + &.links { float: right; left: -100px; @@ -31,15 +37,19 @@ form#loginForm { top: 1px; } } + a { color: #FFF; text-decoration: none; } + div.links a:hover { color: #808080; } + input { - &[type=text], &[type=password] { + &[type=text], + &[type=password] { background: #F3F1EC !important; border: 1px solid #808080; color: #000; @@ -47,12 +57,17 @@ form#loginForm { margin-right: 10px; width: 150px; } - &[type=text], &[type=password] { + + &[type=text], + &[type=password] { width: 200px; } - &[type=text]:hover, &[type=password]:hover { + + &[type=text]:hover, + &[type=password]:hover { background: #FFF !important; } + &[type=submit] { left: 0; margin-left: 0; @@ -60,9 +75,11 @@ form#loginForm { top: 0; } } + table { border-spacing: 0; } + #rememberMeText { cursor: pointer; } diff --git a/core/public/scss/layout/midas.empty.scss b/core/public/scss/layout/midas.empty.scss index 77c0838cc..f60f83a6a 100644 --- a/core/public/scss/layout/midas.empty.scss +++ b/core/public/scss/layout/midas.empty.scss @@ -1,4 +1,4 @@ -/* Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. */ +// Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. @import 'normalize'; @import 'bourbon'; @@ -20,16 +20,20 @@ img { a { cursor: pointer; + &:visited { - border: none; + border: 0; text-decoration: none; } + &:active { outline: none; } } -a:focus, li:active, li:focus { +a:focus, +li:active, +li:focus { outline: none; } @@ -48,10 +52,11 @@ div { &#guideRobot { display: none; } + &.genericBigButton { @include linear-gradient(to bottom, #FFF, #C4C4C4); - border-radius: 3px; border: #354856 1px solid; + border-radius: 3px; box-shadow: 0 0 2px #666; color: #000; cursor: pointer; @@ -60,30 +65,42 @@ div { font-size: 12px; font-weight: normal; list-style-type: none; - padding: 1px 3px 2px 3px; + padding: 1px 3px 2px; + a { color: #000 !important; font-size: 12px !important; font-weight: normal !important; + &:hover { text-decoration: none !important; } } + &:hover { @include linear-gradient(to bottom, #BDDCC9, #8AB79B); } } + &.genericWrapperTopRight { float: right; } - &.viewAction li a:hover, &.genericAction li a:hover, &.viewSelected li a:hover { + + &.viewAction li a:hover, + &.genericAction li a:hover, + &.viewSelected li a:hover { text-decoration: none; } - &.viewAction li img, &.genericAction li img, &.viewSelected li img { + + &.viewAction li img, + &.genericAction li img, + &.viewSelected li img { position: relative; top: 3px; } - &.viewAction hr, &.genericAction hr { + + &.viewAction hr, + &.genericAction hr { background-color: #D7D7D7; border: 0; color: #D7D7D7; @@ -93,11 +110,12 @@ div { margin-top: 3px; width: 130px; } + &.viewSideBar h1 { color: #999; font-size: 11px; - margin-bottom: 0.67em; - margin-top: 0.67em; + margin-bottom: .67em; + margin-top: .67em; text-shadow: #FFF 0 1px 1px; text-transform: uppercase; } @@ -123,17 +141,17 @@ div { } .growlError { - background: url(../../images/icons/nok.png) no-repeat; + background: url('../../images/icons/nok.png') no-repeat; padding-left: 18px; } .growlWarning { - background: url(../../images/icons/warning.png) no-repeat; + background: url('../../images/icons/warning.png') no-repeat; padding-left: 18px; } .growlOk { - background: url(../../images/icons/ok.png) no-repeat; + background: url('../../images/icons/ok.png') no-repeat; padding-left: 18px; } @@ -149,10 +167,12 @@ div { cursor: pointer; font-weight: 500; text-decoration: none; + &:hover { text-decoration: underline; } } + &.errorText { color: #F00; } diff --git a/core/public/scss/layout/midas.layout.scss b/core/public/scss/layout/midas.layout.scss index 7cd934d7d..cda4c8173 100644 --- a/core/public/scss/layout/midas.layout.scss +++ b/core/public/scss/layout/midas.layout.scss @@ -1,4 +1,4 @@ -/* Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. */ +// Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. @import 'normalize'; @import 'bourbon'; @@ -33,24 +33,26 @@ dl { padding: 0; } -dt {} - img { border: 0; } a { cursor: pointer; + &:visited { - border: none; + border: 0; text-decoration: none; } + &:active { outline: none; } } -a:focus, li:active, li:focus { +a:focus, +li:active, +li:focus { outline: none; } @@ -69,10 +71,11 @@ div { &#guideRobot { display: none; } + &.genericBigButton { @include linear-gradient(to bottom, #FFF, #C4C4C4); - border-radius: 3px; border: #354856 1px solid; + border-radius: 3px; box-shadow: 0 0 2px #666; color: #000; cursor: pointer; @@ -81,47 +84,62 @@ div { font-size: 12px; font-weight: normal; list-style-type: none; - padding: 1px 3px 2px 3px; + padding: 1px 3px 2px; + a { color: #000 !important; font-size: 12px !important; font-weight: normal !important; + &:hover { text-decoration: none !important; } } + &:hover { @include linear-gradient(to bottom, #BDDCC9, #8AB79B); } } + &.genericWrapperTopRight { float: right; } + &.viewAction li a { display: inline-block; padding-bottom: 2px; + &:hover { text-decoration: none; } } - &.genericAction li a:hover, &.viewSelected li a:hover { + + &.genericAction li a:hover, + &.viewSelected li a:hover { text-decoration: none; } - &.viewAction li img, &.genericAction li img, &.viewSelected li img { + + &.viewAction li img, + &.genericAction li img, + &.viewSelected li img { position: relative; top: 2px; } + &.genericAction li { &:hover { background-color: #E5E5E5; color: #000; } + a { display: inline-block; padding-bottom: 2px; } } - &.viewAction hr, &.genericAction hr { + + &.viewAction hr, + &.genericAction hr { background-color: #D7D7D7; border: 0; color: #D7D7D7; @@ -158,26 +176,30 @@ div { display: none; min-height: 50px; } + &.TopDynamicClose { margin-right: 10px; margin-top: 0; + a { color: #FFF; font-size: 12px; text-decoration: none; } } + &.TopDynamicBar { .closeButton { float: right; + span { left: -3px; position: relative; top: -4px; } } - .TopDynamicLoading {} } + &.Topbar { @include linear-gradient(to top, #414141, #4B4B4B); border-bottom: 2px #354856 solid; @@ -186,24 +208,29 @@ div { height: 20px; text-align: left; z-index: 99; + div { &.TopbarContent { color: #FFF; padding-top: 4px; } + &.TopbarLeft { float: left; } + &.TopbarRight { float: right; } } + ul { display: block; list-style-type: disc; margin: 0 25px 0 15px; padding: 0; position: relative; + li { border-left: 1px #808080 solid; display: block; @@ -212,8 +239,9 @@ div { margin-left: 10px; padding-left: 10px; position: relative; + &.first { - border: none; + border: 0; display: block; float: left; list-style-type: none; @@ -222,54 +250,62 @@ div { } } } + li a { color: #DDD; display: block; text-decoration: none; + &:hover { background-color: #1D1D1D; text-decoration: none; } } } + &.Header { @include linear-gradient(to top, #56758B, #63869F); box-shadow: 0 0 3px #666; margin: 0 0 15px; padding: 5px 30px; + div { &.HeaderContent { height: 45px; margin: 0 auto; max-width: 1200px; min-width: 800px; - padding: 0 0 0; + padding: 0; } + &.HeaderLogo { - background: url(../../images/midasLogo.gif) no-repeat 0 0; + background: url('../../images/midasLogo.gif') no-repeat 0 0; cursor: pointer; float: left; height: 45px; width: 126px; } + &.HeaderSearch { float: left; padding-left: 35px; padding-top: 6px; position: relative; + a#advancedSearchLink { bottom: -13px; color: #F3F1EC; position: absolute; right: 3px; } + input#live_search { - background: #FFF url(../../images/icons/search.png) no-repeat scroll 3px 4px; - border-radius: 4px; + background: #FFF url('../../images/icons/search.png') no-repeat scroll 3px 4px; border: 1px solid #FFF; + border-radius: 4px; box-shadow: 0 0 15px #666; font-size: 14px; - opacity: 0.9; + opacity: .9; padding: 5px 10px 5px 24px; width: 400px; } @@ -279,7 +315,7 @@ div { } #searchloading { - background: url("../../images/icons/loading-small.gif") bottom center no-repeat; + background: url('../../images/icons/loading-small.gif') bottom center no-repeat; color: #FFF; height: 16px; position: absolute; @@ -307,6 +343,7 @@ div { padding-left: 35px; padding-top: 7px; } + &.HeaderAction { ul { display: block; @@ -314,47 +351,54 @@ div { margin: 0 25px 0 15px; padding: 0; } + a { color: #FFF; display: block; font-size: 14px; font-weight: bold; list-style-type: disc; - margin: 0 5px 0 5px; + margin: 0 5px; padding: 0; text-decoration: none; + img { border: 0; position: relative; top: 2px; } } + ul { li { @include linear-gradient(to bottom, #57BB7D, #32724A); - border-radius: 6px; border: #354856 1px solid; + border-radius: 6px; box-shadow: 0 0 5px #666; cursor: pointer; display: block; float: left; list-style-type: none; - padding: 0 5px 6px 5px; + padding: 0 5px 6px; + &:hover { @include linear-gradient(to bottom, #5BD288, #429D64); } } + img { - padding: 5px 0 0 0; + padding: 5px 0 0; } } } + &.Wrapper { margin: 0 auto; max-width: 1200px; min-width: 800px; padding: 0 30px 30px; } + &.SubWrapper { float: left; margin: 0; @@ -363,64 +407,76 @@ div { width: 100%; z-index: 1; } + &.MainContent { float: left; padding-left: 130px; position: relative; z-index: 1; } + &.SubMainContent { background-color: #FFF; - border-radius: 6px; border: 1px solid #D7D7D7; + border-radius: 6px; box-shadow: 0 0 6px #CCC; min-height: 500px; padding: 0 0 7px; position: relative; width: 850px; } + &.MainContent a { - cursor: pointer; color: #56758B; - text-decoration: none; + cursor: pointer; font-weight: 500; + text-decoration: none; + &:hover { text-decoration: underline; } } + &.SideBar { float: left; margin-left: -18%; right: 215px; width: 150px; + ul { list-style: none; margin: 0; padding: 0; + li { border-bottom: #FFF 1px dotted; color: #354856; cursor: pointer; padding-top: 3px; + &.active { background-color: #E5E5E5; color: #000; } + &.last { border-bottom: none !important; } + &:hover { background-color: #E5E5E5; color: #000; } + a { color: #808080; font-size: 13px; text-decoration: none; + &:hover { text-decoration: none; } - img {} + span { left: 3px; position: relative; @@ -429,28 +485,32 @@ div { } } } + hr { border-bottom: 1px solid #FFF; border-top: 1px solid #DAD8D4; margin: 5px -30px 5px 0; } + h1 { color: #999; font-size: 11px; - margin-bottom: 0.67em; - margin-top: 0.67em; + margin-bottom: .67em; + margin-top: .67em; text-shadow: #FFF 0 1px 1px; text-transform: uppercase; } } + &.viewSideBar h1 { color: #999; font-size: 11px; - margin-bottom: 0.67em; - margin-top: 0.67em; + margin-bottom: .67em; + margin-top: .67em; text-shadow: #FFF 0 1px 1px; text-transform: uppercase; } + &.Footer { clear: both; color: #666; @@ -460,6 +520,7 @@ div { padding-top: 20px; text-align: center; } + &.TopbarRight { li { ul { @@ -467,25 +528,29 @@ div { display: none; height: auto; margin: 0; - padding: 4px 0 0 0; + padding: 4px 0 0; position: absolute; width: 120px; } + &:hover ul { display: block; } } + img { &.arrowUser { position: relative; top: 1px; } + &.languageIcon { position: absolute; right: 0; top: 0; } } + li { li { display: block; @@ -496,11 +561,13 @@ div { position: relative; z-index: 200; } + &:hover li a { background: #4B4B4B; color: #FFF; z-index: 200; } + ul { a { box-shadow: 0 0 5px #666; @@ -514,17 +581,20 @@ div { padding: 0 0 0 5px; text-align: left; z-index: 200; + &:hover { background: #000; text-decoration: none; } } + li:hover a { background: #000; text-decoration: none; } } } + p { clear: left; } @@ -532,13 +602,14 @@ div { } #dialogStartingGuide .blockSet { - border-radius: 10px; border: 1px solid #CCC; + border-radius: 10px; cursor: pointer; float: left; margin: 5px; padding: 1px; width: 262px; + &:hover { border: 2px solid #D3E8F8; box-shadow: 1px 2px 4px #B9B9B9; @@ -558,17 +629,17 @@ div { } .growlError { - background: url(../../images/icons/nok.png) no-repeat; + background: url('../../images/icons/nok.png') no-repeat; padding-left: 18px; } .growlWarning { - background: url(../../images/icons/warning.png) no-repeat; + background: url('../../images/icons/warning.png') no-repeat; padding-left: 18px; } .growlOk { - background: url(../../images/icons/ok.png) no-repeat; + background: url('../../images/icons/ok.png') no-repeat; padding-left: 18px; } diff --git a/core/public/scss/layout/view.scss b/core/public/scss/layout/view.scss index f84739ac4..146cc7f24 100644 --- a/core/public/scss/layout/view.scss +++ b/core/public/scss/layout/view.scss @@ -1,4 +1,4 @@ -/* Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. */ +// Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. div.viewHeader { background-color: #F6F9FE; @@ -24,6 +24,7 @@ div { padding-right: 275px; position: relative; } + &.viewMain { float: left; margin: 0; @@ -31,16 +32,16 @@ div { position: relative; width: 100%; } + &.viewSideBar { background-color: transparent; - border-bottom: none; + border-bottom: 0; border-left: 1px solid #EFEFEF; - border-radius: 0 0; - border-right: none; - border-top: none; + border-radius: 0; + border-right: 0; + border-top: 0; float: left; height: auto !important; - height: 100%; margin-right: -300px; min-height: 500px; padding-left: 10px; @@ -49,9 +50,11 @@ div { width: 215px; z-index: 2; } + &.viewSelected { display: none; } + &.viewNotice { background-color: #45B775; border: 1px solid #168846; @@ -60,39 +63,51 @@ div { padding: 2px 10px; position: absolute; } + &.viewNoticeWrapper { left: 145px; position: relative; top: 4px; } + &.viewSideBar div { &.sideElement { border-bottom: 1px solid #FFF; border-top: 1px solid #DAD8D4; padding-bottom: 10px; } + &.sideElementFirst { border-top: none !important; padding-bottom: 5px; } + &.sideElementActions { border-bottom: 1px solid #FFF; border-top: 1px solid #DAD8D4; padding-top: 5px; } - &.sideElement, &.sideElementActions, &.sideElementFirst { + + &.sideElement, + &.sideElementActions, + &.sideElementFirst { border-bottom: 1px solid #DAD8D4; border-top: none !important; padding-bottom: 10px; padding-top: 3px; } + &.sideElementLast { border-bottom: none !important; border-top: none !important; padding-bottom: 10px; padding-top: 5px; } - &.sideElement ul, &.sideElementFirst ul, &.sideElementActions ul, &.sideElementLast ul { + + &.sideElement ul, + &.sideElementFirst ul, + &.sideElementActions ul, + &.sideElementLast ul { list-style: none; margin: 0; padding: 0; @@ -105,27 +120,32 @@ ul.pathBrowser { list-style-type: disc; margin: 0; padding-left: 0; + li { - background: url("../../images/icons/path-divider.png") no-repeat right; + background: url('../../images/icons/path-divider.png') no-repeat right; display: list-item; float: left; list-style: none; margin: 0; min-height: 19px; padding: 5px 16px 0 3px; + img { margin-right: 2px; position: relative; top: -2px; } + span { position: relative; top: -4px; } + a { color: #333B80; font-size: 14px; font-weight: bold; + &:hover { color: #375; text-decoration: none; @@ -137,23 +157,27 @@ ul.pathBrowser { div { &.ui-tabs { border: 0; - padding: 0 0 0 0 !important; + padding: 0 !important; } + &.tabs { .ui-tabs-nav { background: none !important; border: 0 !important; border-bottom: 1px dotted #808080; } - .ui-state-default {} } } -.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active { +.ui-state-active, +.ui-widget-content .ui-state-active, +.ui-widget-header .ui-state-active { border: 1px solid #C5DBEC !important; } -.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { +.ui-state-default, +.ui-widget-content .ui-state-default, +.ui-widget-header .ui-state-default { border: 1px solid #F3F1EC; } @@ -161,7 +185,8 @@ div { background: #FFF !important; } -div.tabs .ui-tabs .ui-tabs-nav li a, .ui-tabs .ui-tabs-nav li a { +div.tabs .ui-tabs .ui-tabs-nav li a, +.ui-tabs .ui-tabs-nav li a { padding: 3px 10px !important; } @@ -170,28 +195,32 @@ div.tabs { color: #1D5987 !important; font-weight: bold; height: 19px !important; + a { color: #1D5987 !important; font-weight: bold; height: 19px !important; } } + .ui-state-default { height: 20px; } + .ui-tabs-panel { border-top: 1px solid #F3F1EC; left: -15px !important; position: relative !important; width: 99%; } + display: none; } img.progressIndeterminate { display: block; - margin-top: 13px; margin-bottom: 13px; + margin-top: 13px; } div.MainDialog h4 { diff --git a/core/public/scss/licenses/licenses.index.scss b/core/public/scss/licenses/licenses.index.scss index 8f0347c79..c10fdd964 100644 --- a/core/public/scss/licenses/licenses.index.scss +++ b/core/public/scss/licenses/licenses.index.scss @@ -1,4 +1,4 @@ -/* Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. */ +// Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. input.licenseName { margin-bottom: 8px !important; diff --git a/core/public/scss/rest/rest.index.scss b/core/public/scss/rest/rest.index.scss index 0d5011efc..19d29650d 100644 --- a/core/public/scss/rest/rest.index.scss +++ b/core/public/scss/rest/rest.index.scss @@ -1,4 +1,4 @@ -/* Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. */ +// Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. @import 'bourbon'; @@ -13,6 +13,7 @@ form#loginForm { border-collapse: separate !important; border-color: #808080 !important; border-spacing: 2px !important; + tbody tr td { border-bottom: none !important; border-collapse: separate !important; @@ -22,6 +23,7 @@ form#loginForm { padding: 0 !important; } } + td { display: table-cell !important; vertical-align: inherit !important; @@ -33,7 +35,8 @@ th { vertical-align: inherit !important; } -strong, b { +strong, +b { font-weight: bold; } @@ -44,9 +47,11 @@ div { cursor: pointer !important; padding-top: 3px !important; } + &.viewMain { width: 820px !important; } + &.footer { display: none !important; } diff --git a/core/public/scss/search/search.index.scss b/core/public/scss/search/search.index.scss index df4c25f1c..d6570e15d 100644 --- a/core/public/scss/search/search.index.scss +++ b/core/public/scss/search/search.index.scss @@ -1,11 +1,12 @@ -/* Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. */ +// Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. ul#searchResults { display: none; list-style: none; - margin: 0 0 0 0; - padding: 0 0 0 0; + margin: 0; + padding: 0; position: relative; + li.searchElement { border-bottom: 1px dotted #808080; margin-top: 3px; @@ -32,6 +33,7 @@ span { position: absolute; right: 10px; } + &.descriptionSearchResult { margin-left: 20px; } diff --git a/core/public/scss/share/share.dialog.scss b/core/public/scss/share/share.dialog.scss index 8a34e2912..a82b899b1 100644 --- a/core/public/scss/share/share.dialog.scss +++ b/core/public/scss/share/share.dialog.scss @@ -1,9 +1,10 @@ -/* Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. */ +// Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. input { &#urlInput { width: 300px; } + &#live_share_search { width: 350px; } @@ -12,18 +13,22 @@ input { div { &#permissionEntity table { width: 330px; + td { &.changePermissionSelect { width: 150px; } + &.changePermissionDelete { width: 30px; } + &.changePermissionSelectBox { width: 100px; } } } + &#permissionsContent { a { color: #56758B; @@ -31,23 +36,28 @@ div { font-weight: 500; text-decoration: none; } + h4 { margin-top: 10px; } + a:hover { text-decoration: underline; } } + &#applyPoliciesRecursiveProgressBar { height: 20px; } + &#applyPoliciesRecursiveMessage { padding-bottom: 5px; padding-top: 5px; } } -#permissionPublic, #permissionPrivate { +#permissionPublic, +#permissionPrivate { border-bottom: 1px solid #D7D7D7; padding-bottom: 10px; } diff --git a/core/public/scss/share/share.links.scss b/core/public/scss/share/share.links.scss index c02e17c3c..5a01d44b9 100644 --- a/core/public/scss/share/share.links.scss +++ b/core/public/scss/share/share.links.scss @@ -1,16 +1,19 @@ -/* Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. */ +// Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. -#resourceViewDisplay, #resourceDownloadDisplay { +#resourceViewDisplay, +#resourceDownloadDisplay { height: 16px; width: 360px; } -.viewLinkContainer, .downloadLinkContainer { +.viewLinkContainer, +.downloadLinkContainer { margin-bottom: 20px; } -#selectViewUrl, #selectDownloadUrl { - background: url(../../images/icons/paste_plain.png) no-repeat 2px 2px; +#selectViewUrl, +#selectDownloadUrl { + background: url('../../images/icons/paste_plain.png') no-repeat 2px 2px; border: 1px solid #777; height: 22px; position: relative; @@ -18,7 +21,8 @@ width: 22px; } -#selectViewUrl:hover, #selectDownloadUrl:hover { +#selectViewUrl:hover, +#selectDownloadUrl:hover { background-color: #ADA; cursor: pointer; } diff --git a/core/public/scss/upload/upload.revision.scss b/core/public/scss/upload/upload.revision.scss index 7c05db5d7..c1954306a 100644 --- a/core/public/scss/upload/upload.revision.scss +++ b/core/public/scss/upload/upload.revision.scss @@ -1,4 +1,4 @@ -/* Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. */ +// Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. @import 'bourbon'; @@ -9,6 +9,7 @@ .uploadValidationError { display: none; margin: 5px 0; + img { position: relative; top: 3px; @@ -25,14 +26,15 @@ .drop-zone { background-color: #5CB85C; - border-radius: 5px; border: 1px solid #4CAE4C; + border-radius: 5px; color: #FFF; display: inline-block; font-size: 16px; font-weight: bold; margin-bottom: 8px; padding: 14px 20px; + &:hover { @include linear-gradient(to bottom, #4CA84C, #5CB85C); border: 1px solid #484; @@ -42,8 +44,8 @@ .start-upload { background-color: #5C5CB8; - border-radius: 3px; border: 1px solid #4C4CAE; + border-radius: 3px; color: #FFF; cursor: pointer; display: inline-block; @@ -72,9 +74,9 @@ .upload-status-container { background-color: #FAFAFA; - border-radius: 4px; border: 1px solid #F0F0F0; - box-shadow: inset 0 0 3px 2px rgba(0, 0, 0, 0.02); + border-radius: 4px; + box-shadow: inset 0 0 3px 2px rgba(0, 0, 0, .02); margin-bottom: 12px; margin-right: 10px; padding: 10px; diff --git a/core/public/scss/upload/upload.simpleupload.scss b/core/public/scss/upload/upload.simpleupload.scss index cd0c4bd36..cd482e70a 100644 --- a/core/public/scss/upload/upload.simpleupload.scss +++ b/core/public/scss/upload/upload.simpleupload.scss @@ -1,4 +1,4 @@ -/* Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. */ +// Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. @import 'bourbon'; @@ -13,6 +13,7 @@ div.uploadValidationError { display: none; margin: 5px 0; + img { position: relative; top: 3px; @@ -29,14 +30,15 @@ div.uploadValidationError { .drop-zone { background-color: #5CB85C; - border-radius: 5px; border: 1px solid #4CAE4C; + border-radius: 5px; color: #FFF; display: inline-block; font-size: 16px; font-weight: bold; margin-bottom: 8px; padding: 14px 20px; + &:hover { @include linear-gradient(to bottom, #4CA84C, #5CB85C); border: 1px solid #484; @@ -46,8 +48,8 @@ div.uploadValidationError { .start-upload { background-color: #5C5CB8; - border-radius: 3px; border: 1px solid #4C4CAE; + border-radius: 3px; color: #FFF; cursor: pointer; display: inline-block; @@ -76,9 +78,9 @@ div.uploadValidationError { .upload-status-container { background-color: #FAFAFA; - border-radius: 4px; border: 1px solid #F0F0F0; - box-shadow: inset 0 0 3px 2px rgba(0, 0, 0, 0.02); + border-radius: 4px; + box-shadow: inset 0 0 3px 2px rgba(0, 0, 0, .02); margin-bottom: 12px; margin-right: 10px; padding: 10px; diff --git a/core/public/scss/user/user.deletedialog.scss b/core/public/scss/user/user.deletedialog.scss index be871330b..a0d59d37b 100644 --- a/core/public/scss/user/user.deletedialog.scss +++ b/core/public/scss/user/user.deletedialog.scss @@ -1,9 +1,10 @@ -/* Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. */ +// Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. span { &#deleteDialogUserName { font-weight: bold; } + &#deleteDialogCaution { color: #B00; font-weight: bolder; diff --git a/core/public/scss/user/user.emailregister.scss b/core/public/scss/user/user.emailregister.scss index 69d052137..dafd649f0 100644 --- a/core/public/scss/user/user.emailregister.scss +++ b/core/public/scss/user/user.emailregister.scss @@ -1,4 +1,4 @@ -/* Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. */ +// Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. div.viewMain { width: 820px !important; @@ -12,6 +12,7 @@ div { &.emailLabelContainer { height: 22px; } + &.tosContainer { margin-bottom: 10px; margin-top: 12px; diff --git a/core/public/scss/user/user.index.scss b/core/public/scss/user/user.index.scss index 369db943a..145062877 100644 --- a/core/public/scss/user/user.index.scss +++ b/core/public/scss/user/user.index.scss @@ -1,15 +1,16 @@ -/* Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. */ +// Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. div { - &.userList {} &.userBlock { border-bottom: 1px dotted #808080; padding-bottom: 5px; padding-top: 5px; } + &.userList span { padding-left: 15px; } + &.userBlock:hover { background-color: #F6F9FE; cursor: pointer; @@ -23,18 +24,22 @@ div { div { &.userStats { - border: none; + border: 0; color: #777; float: right; font-size: 10px; } + &.adminCreateUser { margin-top: 20px; } - &.loginError, &.registerError { + + &.loginError, + &.registerError { color: #F00; font-weight: bold; } + &.loginError { padding-bottom: 8px; } @@ -44,6 +49,7 @@ input { &.invalidField { background-color: #FF9191; } + &.validField { background-color: #91FF91; } @@ -51,18 +57,24 @@ input { .dialogForm { margin-bottom: 0; + td { font-size: 14px; } + input { font-size: 14px; - &[type=text], &[type=password] { + + &[type=text], + &[type=password] { width: 200px; } - &[type=button], &[type=submit] { + + &[type=button], + &[type=submit] { background: #8689DE; - border-radius: 3px; border: 0; + border-radius: 3px; color: #FFF; cursor: pointer; float: right; @@ -70,9 +82,11 @@ input { font-weight: bold; margin-right: 0; margin-top: 5px; - padding: 6px 8px 6px 8px; + padding: 6px 8px; } - &[type=button]:hover, &[type=submit]:hover { + + &[type=button]:hover, + &[type=submit]:hover { background: #CBD9E3; color: #1D5987; text-decoration: none; diff --git a/core/public/scss/user/user.manage.scss b/core/public/scss/user/user.manage.scss index b509fe92b..a55ee6bed 100644 --- a/core/public/scss/user/user.manage.scss +++ b/core/public/scss/user/user.manage.scss @@ -1,19 +1,22 @@ -/* Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. */ +// Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. div.radioElement { label { float: inherit !important; width: 600px !important; } + ul { list-style: none; margin: 0 0 0 100px; - padding: 0 0 0 0; + padding: 0; width: 600px !important; } + h4 { margin-bottom: 4px; } + br { display: none; } @@ -37,6 +40,7 @@ h1 { #cart { float: left; width: 200px; + ol { margin: 0; padding: 1em 0 1em 3em; @@ -60,6 +64,7 @@ span.communityTitle { div.communityList { opacity: .90; + span.communityShortDescription { padding-left: 15px; } diff --git a/core/public/scss/user/user.register.scss b/core/public/scss/user/user.register.scss index 74f12e75f..f261d3697 100644 --- a/core/public/scss/user/user.register.scss +++ b/core/public/scss/user/user.register.scss @@ -1,4 +1,4 @@ -/* Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. */ +// Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. div { &.registerContent { @@ -6,35 +6,41 @@ div { margin-right: auto; width: 900px; } + &.registerInfo { background-color: #363535; - border-radius: 4px; border: 1px solid #808080; + border-radius: 4px; color: #FFF; float: left; margin-bottom: 7px; margin-top: 15px; padding: 8px; width: 250px; + h4 { color: #84ACC8; margin-bottom: 3px; margin-left: 5px; margin-top: 2px; } + h3 { margin-bottom: 0; margin-top: 0; } + ul { list-style: circle; margin-top: 0; padding-left: 20px; padding-top: 3px; } + li { color: #DDD; } + a { color: #84ACC8; font-size: 13px; @@ -42,37 +48,42 @@ div { text-decoration: underline; } } - &.register {} } form#registerForm { color: #FFF; margin-left: 280px; padding-top: 19px; - div {} + input { - &[type=text], &[type=password] { + &[type=text], + &[type=password] { background: #F3F1EC !important; border: 1px solid #808080; color: #000; height: 18px; width: 185px; } - &[type=text]:hover, &[type=password]:hover { + + &[type=text]:hover, + &[type=password]:hover { background: #FFF !important; } - &[type=submit] {} } + div span img { position: relative; top: 3px; } + .termLabel { display: block; } + div.registerError { color: #57BB7D; position: absolute; + span { display: none; position: relative; @@ -83,6 +94,7 @@ form#registerForm { a.termOfService { color: #F3F1EC; + &:hover { color: #F3F1EC; } diff --git a/core/public/scss/user/user.settings.scss b/core/public/scss/user/user.settings.scss index 5f7c3c314..1397ff938 100644 --- a/core/public/scss/user/user.settings.scss +++ b/core/public/scss/user/user.settings.scss @@ -1,4 +1,4 @@ -/* Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. */ +// Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. div#tabsSettings { display: none; @@ -11,13 +11,16 @@ form { float: left; width: 80px; } + input { - &[type="text"], &[type="password"] { + &[type='text'], + &[type='password'] { width: 200px !important; } } } - &#modifyPassword input[type="password"] { + + &#modifyPassword input[type='password'] { width: 200px !important; } } @@ -25,14 +28,17 @@ form { div { &#accountPrivacy { margin-left: 100px; + label { float: none !important; width: auto !important; } + br { display: none; } } + &#imageActual { float: right; } @@ -43,6 +49,8 @@ div { } div#tabsSettings { + background: none !important; + .ui-tabs-nav { background: none !important; border-bottom: 1px solid #D7D7D7 !important; @@ -53,10 +61,11 @@ div#tabsSettings { height: 22px !important; padding-left: 10px; } + .ui-widget-content { background: none !important; } - background: none !important; + .ui-tabs .ui-tabs-nav li a { padding: 3px 10px !important; } @@ -71,15 +80,18 @@ div#tabsSettings { color: #1D5987 !important; font-weight: bold; height: 19px !important; + a { color: #1D5987 !important; font-weight: bold; height: 19px !important; } } + .ui-state-default { height: 20px; } + .ui-tabs-panel { width: 99%; } diff --git a/core/public/scss/user/user.userpage.scss b/core/public/scss/user/user.userpage.scss index 89f04725a..dcd34773c 100644 --- a/core/public/scss/user/user.userpage.scss +++ b/core/public/scss/user/user.userpage.scss @@ -1,4 +1,4 @@ -/* Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. */ +// Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. #locationUser { color: #808080; diff --git a/modules/api/public/scss/index/index.index.scss b/modules/api/public/scss/index/index.index.scss index a6d3a7b33..1238e2fec 100644 --- a/modules/api/public/scss/index/index.index.scss +++ b/modules/api/public/scss/index/index.index.scss @@ -1,4 +1,4 @@ -/* Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. */ +// Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. div.helpContent { background-color: #DDD; diff --git a/modules/archive/public/scss/extract/extract.dialog.scss b/modules/archive/public/scss/extract/extract.dialog.scss index 318a8765f..399e9ddca 100644 --- a/modules/archive/public/scss/extract/extract.dialog.scss +++ b/modules/archive/public/scss/extract/extract.dialog.scss @@ -1,4 +1,4 @@ -/* Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. */ +// Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. #extractArchiveProgressMessage { margin-bottom: 20px; diff --git a/modules/cleanup/public/scss/item/index.index.scss b/modules/cleanup/public/scss/item/index.index.scss index cb699d7ef..3efb548ca 100644 --- a/modules/cleanup/public/scss/item/index.index.scss +++ b/modules/cleanup/public/scss/item/index.index.scss @@ -1,9 +1,10 @@ -/* Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. */ +// Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. div { &.viewSideBar input.globalButton { margin-left: 0 !important; } + &.viewWrapper { padding-right: 40px !important; } diff --git a/modules/comments/public/scss/item/item.comments.scss b/modules/comments/public/scss/item/item.comments.scss index 87bc1e5c0..4dc0c3a8b 100644 --- a/modules/comments/public/scss/item/item.comments.scss +++ b/modules/comments/public/scss/item/item.comments.scss @@ -1,4 +1,4 @@ -/* Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. */ +// Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. @import 'bourbon'; @@ -7,27 +7,30 @@ div { border-bottom: 1px dashed #C0C0C0; padding-bottom: 5px; } + &.loginToComment { border-bottom: 1px dashed #C0C0C0; padding-bottom: 8px; } } -#registerToComment, #loginToComment { +#registerToComment, +#loginToComment { color: #56758B; font-weight: bold; text-decoration: none; } -#registerToComment:hover, #loginToComment:hover { +#registerToComment:hover, +#loginToComment:hover { cursor: pointer; text-decoration: underline; } #addCommentDiv { + border: 1px solid #BDC7D8; border-collapse: separate; border-spacing: 0; - border: 1px solid #BDC7D8; width: 100%; } @@ -43,7 +46,8 @@ div { width: 99%; } -.commentLimit, .commentAs { +.commentLimit, +.commentAs { border-right: 1px solid #E2E2E2; color: #777; float: left; @@ -53,7 +57,8 @@ div { padding-right: 5px; } -.commentLimitString, .postingAsString { +.commentLimitString, +.postingAsString { margin-top: 5px; } @@ -90,12 +95,14 @@ a.commentUserName { font-weight: bold !important; margin-left: 8px; text-decoration: none; + &:visited { color: #56758B; font-weight: bold !important; margin-left: 8px; text-decoration: none; } + &:hover { text-decoration: underline; } @@ -106,8 +113,6 @@ a.commentUserName { margin-top: 8px; } -.commentText {} - .commentDate { color: #969696; } @@ -144,6 +149,7 @@ a.commentItrLink { font-size: 13px; font-weight: bold; text-decoration: none; + &:visited { color: #56758B; font-family: $lucida-grande; @@ -151,6 +157,7 @@ a.commentItrLink { font-weight: bold; text-decoration: none; } + &:hover { color: #B85541; text-decoration: underline; diff --git a/modules/communityagreement/public/scss/community/community.agreementdialog.scss b/modules/communityagreement/public/scss/community/community.agreementdialog.scss index ef6305711..c8bf79d88 100644 --- a/modules/communityagreement/public/scss/community/community.agreementdialog.scss +++ b/modules/communityagreement/public/scss/community/community.agreementdialog.scss @@ -1,10 +1,10 @@ -/* Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. */ +// Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. div { &.agreementWarning { background-color: #E7FFD1; - border-radius: 3px; border: #3A3 1px solid; + border-radius: 3px; box-shadow: 0 0 2px #666; color: #000; display: block; @@ -12,8 +12,9 @@ div { font-weight: normal; list-style-type: none; margin-bottom: 12px; - padding: 1px 4px 4px 4px; + padding: 1px 4px 4px; } + &.licenseDisplay { border-bottom: #D7D7D7 1px solid; border-top: #D7D7D7 1px solid; @@ -23,11 +24,13 @@ div { padding-bottom: 8px; padding-top: 8px; } + &.agreementWarning img { padding: 0; position: relative; top: 3px; } + &.agreementButtons { float: right; margin-top: 10px; diff --git a/modules/communityagreement/public/scss/community/community.agreementtab.scss b/modules/communityagreement/public/scss/community/community.agreementtab.scss index c350abcaa..402e4db2f 100644 --- a/modules/communityagreement/public/scss/community/community.agreementtab.scss +++ b/modules/communityagreement/public/scss/community/community.agreementtab.scss @@ -1,4 +1,4 @@ -/* Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. */ +// Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. textarea#agreement { height: 160px; @@ -9,8 +9,8 @@ div.formLabel { color: #999; font-size: 11px; font-weight: bold; - margin-bottom: 0.67em; - margin-top: 0.67em; + margin-bottom: .67em; + margin-top: .67em; text-transform: uppercase; } diff --git a/modules/dicomanonymize/public/scss/upload/upload.index.scss b/modules/dicomanonymize/public/scss/upload/upload.index.scss index f347782d3..ae07da6de 100644 --- a/modules/dicomanonymize/public/scss/upload/upload.index.scss +++ b/modules/dicomanonymize/public/scss/upload/upload.index.scss @@ -1,4 +1,4 @@ -/* Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. */ +// Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. div.chooseFolderMessage { margin-bottom: 10px; diff --git a/modules/dicomserver/public/scss/admin/admin.index.scss b/modules/dicomserver/public/scss/admin/admin.index.scss index 6e149b120..da18b0ffd 100644 --- a/modules/dicomserver/public/scss/admin/admin.index.scss +++ b/modules/dicomserver/public/scss/admin/admin.index.scss @@ -1,11 +1,15 @@ -/* Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. */ +// Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. span { &.running_status { color: #090; font-weight: bold; } - &.not_running_status, &.only_storescp_running_status, &.only_dcmqrscp_running_status, &.not_supported_status { + + &.not_running_status, + &.only_storescp_running_status, + &.only_dcmqrscp_running_status, + &.not_supported_status { color: #C80000; font-weight: bold; } diff --git a/modules/javauploaddownload/public/scss/download/download.index.scss b/modules/javauploaddownload/public/scss/download/download.index.scss index b2d0849f3..fddaf3053 100644 --- a/modules/javauploaddownload/public/scss/download/download.index.scss +++ b/modules/javauploaddownload/public/scss/download/download.index.scss @@ -1,9 +1,9 @@ -/* Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. */ +// Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. .downloadDescription { background-color: #AFA; - border-radius: 5px; border: 2px solid #9D9; + border-radius: 5px; margin-top: 6px; padding: 6px 5px 6px 8px; } diff --git a/modules/javauploaddownload/public/scss/upload/upload.index.scss b/modules/javauploaddownload/public/scss/upload/upload.index.scss index 4a53a6643..9daa5dd5b 100644 --- a/modules/javauploaddownload/public/scss/upload/upload.index.scss +++ b/modules/javauploaddownload/public/scss/upload/upload.index.scss @@ -1,4 +1,4 @@ -/* Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. */ +// Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. .belowDestinationUpload { display: none; diff --git a/modules/javauploaddownload/public/scss/upload/upload.revision.scss b/modules/javauploaddownload/public/scss/upload/upload.revision.scss index d987c1e5e..71e521e59 100644 --- a/modules/javauploaddownload/public/scss/upload/upload.revision.scss +++ b/modules/javauploaddownload/public/scss/upload/upload.revision.scss @@ -1,4 +1,4 @@ -/* Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. */ +// Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. .belowDestinationUpload { display: none; diff --git a/modules/keyfiles/public/scss/item/keyfiles.item.view.scss b/modules/keyfiles/public/scss/item/keyfiles.item.view.scss index 2b0820bc5..2d47fadb2 100644 --- a/modules/keyfiles/public/scss/item/keyfiles.item.view.scss +++ b/modules/keyfiles/public/scss/item/keyfiles.item.view.scss @@ -1,4 +1,4 @@ -/* Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. */ +// Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. img.downloadKeyFileIcon { cursor: pointer; diff --git a/modules/mfa/public/scss/config/config.index.scss b/modules/mfa/public/scss/config/config.index.scss index 741156536..2e6a8b4c8 100644 --- a/modules/mfa/public/scss/config/config.index.scss +++ b/modules/mfa/public/scss/config/config.index.scss @@ -1,4 +1,4 @@ -/* Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. */ +// Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. .formElement { margin-top: 10px; diff --git a/modules/mfa/public/scss/config/config.usertab.scss b/modules/mfa/public/scss/config/config.usertab.scss index 1db166d60..e60a2e38a 100644 --- a/modules/mfa/public/scss/config/config.usertab.scss +++ b/modules/mfa/public/scss/config/config.usertab.scss @@ -1,4 +1,4 @@ -/* Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. */ +// Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. #otpLength { width: 25px; diff --git a/modules/mfa/public/scss/login/login.dialog.scss b/modules/mfa/public/scss/login/login.dialog.scss index 6e87fc4ea..e99a65134 100644 --- a/modules/mfa/public/scss/login/login.dialog.scss +++ b/modules/mfa/public/scss/login/login.dialog.scss @@ -1,4 +1,4 @@ -/* Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. */ +// Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. #otpLoginSubmit { float: right; @@ -6,7 +6,7 @@ } #otpToken { - background: #FFF url(../../../../../core/public/images/icons/lock.png) no-repeat scroll 2px 2px; + background: #FFF url('../../../../../core/public/images/icons/lock.png') no-repeat scroll 2px 2px; padding-left: 20px; width: 90%; } diff --git a/modules/oauth/public/scss/authorize/authorize.index.scss b/modules/oauth/public/scss/authorize/authorize.index.scss index 3a61dd8a1..67c57681a 100644 --- a/modules/oauth/public/scss/authorize/authorize.index.scss +++ b/modules/oauth/public/scss/authorize/authorize.index.scss @@ -1,4 +1,4 @@ -/* Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. */ +// Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. body { background-color: #F5F5F5; @@ -8,17 +8,21 @@ body { .form-login { background-color: #FAFAFA; - border-radius: 5px; border: 1px solid #E5E5E5; - box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); + border-radius: 5px; + box-shadow: 0 1px 2px rgba(0, 0, 0, .05); margin: 0 auto 20px; max-width: 600px; padding: 19px 29px 29px; - .form-login-heading, .checkbox { + + .form-login-heading, + .checkbox { margin-bottom: 10px; } + input { - &[type="text"], &[type="password"] { + &[type='text'], + &[type='password'] { font-size: 16px; height: auto; margin-bottom: 15px; @@ -38,17 +42,19 @@ ul.scopeList { div { &.authorizationText { background-color: #FFB; - border-radius: 5px; border: 1px solid #C0C0C0; - box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); + border-radius: 5px; + box-shadow: 0 1px 2px rgba(0, 0, 0, .05); margin-bottom: 18px; - padding: 10px 12px 5px 12px; + padding: 10px 12px 5px; } + &.loginErrorMessage { color: #EE1010; font-weight: bold; margin-bottom: 10px; } + &.logoContainer { border-bottom: 1px solid #D7D7D7; margin-bottom: 12px; @@ -56,6 +62,7 @@ div { padding-bottom: 8px; text-align: right; } + &.buttonBar { text-align: right; } diff --git a/modules/oauth/public/scss/client/client.index.scss b/modules/oauth/public/scss/client/client.index.scss index b71a55031..f2264aac1 100644 --- a/modules/oauth/public/scss/client/client.index.scss +++ b/modules/oauth/public/scss/client/client.index.scss @@ -1,4 +1,4 @@ -/* Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. */ +// Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. div { &.sectionHeader { @@ -9,24 +9,28 @@ div { margin-bottom: 5px; padding-top: 3px; } + &.sectionContainer { margin-bottom: 30px; padding-top: 6px; } } -.myClientsTable th, .myAuthorizationsTable th { +.myClientsTable th, +.myAuthorizationsTable th { background-color: #DDE4E4; font-weight: normal; padding: 3px 10px 3px 5px; } -.myClientsTable td, .myAuthorizationsTable td { +.myClientsTable td, +.myAuthorizationsTable td { background-color: #FBFBFB; padding: 3px; } -.myClientsTable, .myAuthorizationsTable { +.myClientsTable, +.myAuthorizationsTable { width: 100%; } @@ -45,6 +49,7 @@ div { div.bottomButtons { float: right; margin-top: 25px; + input { margin-left: 10px; } diff --git a/modules/packages/public/scss/application/packages.application.latest.scss b/modules/packages/public/scss/application/packages.application.latest.scss index 57e108d11..2364c6482 100644 --- a/modules/packages/public/scss/application/packages.application.latest.scss +++ b/modules/packages/public/scss/application/packages.application.latest.scss @@ -1,7 +1,8 @@ -/* Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. */ +// Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. div.viewMain { width: 805px; + h2 { color: #545454; font-size: 15px; @@ -11,6 +12,7 @@ div.viewMain { #platformList { margin-top: 15px; + h3 a { text-decoration: none; } @@ -24,23 +26,27 @@ div.platformContainer { } table.packagesTable { - border-collapse: collapse; border: 0; + border-collapse: collapse; width: 100%; + a img { position: relative; top: 2px; } + td { border: 1px solid #D7D7D7; padding-bottom: 3px; padding-left: 4px; padding-top: 2px; } + tr { &.odd { background-color: #F4F4F4; } + &.even { background-color: #FFF; } diff --git a/modules/packages/public/scss/application/packages.application.view.scss b/modules/packages/public/scss/application/packages.application.view.scss index 55566062c..05da4e4b1 100644 --- a/modules/packages/public/scss/application/packages.application.view.scss +++ b/modules/packages/public/scss/application/packages.application.view.scss @@ -1,4 +1,4 @@ -/* Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. */ +// Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. @import 'bourbon'; @@ -6,12 +6,14 @@ div { &.titleWrapper { border-bottom: 1px solid #D7D7D7; } + &.applicationName { color: #525252; font-size: 20px; font-weight: bold; margin-bottom: 5px; } + &.applicationDescription { color: #6D6D6D; margin-bottom: 8px; @@ -20,6 +22,7 @@ div { #packageList { margin-top: 15px; + h3 a { text-decoration: none; } @@ -32,9 +35,10 @@ div.releaseEntry { } table.packagesTable { - border-collapse: collapse; @include user-select(none); + border-collapse: collapse; width: 550px; + th { background-color: #CCD7E0; border: 1px #888 solid; @@ -49,7 +53,9 @@ th { &.actions { width: 40%; } - &.platform, &.type { + + &.platform, + &.type { width: 30%; } } @@ -60,6 +66,7 @@ table.packagesTable tbody td { padding-bottom: 3px; padding-left: 3px; padding-top: 3px; + img { position: relative; top: 2px; @@ -70,6 +77,7 @@ form.editApplication { input[type=text] { width: 300px; } + textarea { resize: none; width: 298px; diff --git a/modules/packages/public/scss/package/package.manage.scss b/modules/packages/public/scss/package/package.manage.scss index 68386b8ea..4f00ba393 100644 --- a/modules/packages/public/scss/package/package.manage.scss +++ b/modules/packages/public/scss/package/package.manage.scss @@ -1,14 +1,16 @@ -/* Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. */ +// Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. div { &.viewMain { + width: 805px; + h2 { color: #545454; margin-bottom: 3px; margin-top: 3px; } - width: 805px; } + &.headerSection { border-bottom: 1px solid #D7D7D7; margin-bottom: 10px; diff --git a/modules/packages/public/scss/view/packages.view.project.scss b/modules/packages/public/scss/view/packages.view.project.scss index deded9f99..6a8cd77af 100644 --- a/modules/packages/public/scss/view/packages.view.project.scss +++ b/modules/packages/public/scss/view/packages.view.project.scss @@ -1,28 +1,34 @@ -/* Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. */ +// Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. div { &.introText { margin-bottom: 20px; } + &.applicationList a.applicationLink { font-size: 18px; font-weight: bold; text-decoration: none; + &:hover { text-decoration: underline; } } + &.noApplications { font-style: italic; } + &.applicationDescription { margin-top: 6px; } + &.applicationContainer { border-top: 1px solid #D7D7D7; margin-top: 20px; padding-top: 8px; } + &.createApplicationContainer { border-top: 1px solid #D7D7D7; margin-top: 20px; @@ -34,6 +40,7 @@ form.createApplication { input[type=text] { width: 300px; } + textarea { resize: none; width: 298px; diff --git a/modules/pvw/public/scss/admin/admin.status.scss b/modules/pvw/public/scss/admin/admin.status.scss index a242a9564..c11cd2740 100644 --- a/modules/pvw/public/scss/admin/admin.status.scss +++ b/modules/pvw/public/scss/admin/admin.status.scss @@ -1,12 +1,14 @@ -/* Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. */ +// Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. table.instances { border-collapse: collapse; + th { background-color: #BDD; border: 1px solid #D7D7D7; padding: 3px; } + td { border: 1px solid #D7D7D7; padding: 3px; @@ -17,6 +19,7 @@ span { &.running { color: #008000; } + &.dead { color: #F00; } diff --git a/modules/pvw/public/scss/paraview/paraview.common.scss b/modules/pvw/public/scss/paraview/paraview.common.scss index a3642acb7..56e8c34da 100644 --- a/modules/pvw/public/scss/paraview/paraview.common.scss +++ b/modules/pvw/public/scss/paraview/paraview.common.scss @@ -1,4 +1,4 @@ -/* Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. */ +// Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. div.midas-pvw-status { font-size: 14px; diff --git a/modules/pvw/public/scss/paraview/paraview.slice.scss b/modules/pvw/public/scss/paraview/paraview.slice.scss index f3c2fe337..153b1e2ed 100644 --- a/modules/pvw/public/scss/paraview/paraview.slice.scss +++ b/modules/pvw/public/scss/paraview/paraview.slice.scss @@ -1,11 +1,13 @@ -/* Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. */ +// Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. -#sliceSlider, #windowLevelSlider { +#sliceSlider, +#windowLevelSlider { margin: 8px 14px 8px 10px; width: 551px; } -#sliceInfo, #windowLevelInfo { +#sliceInfo, +#windowLevelInfo { color: #FFF; margin-left: 10px; z-index: 3; @@ -51,14 +53,17 @@ button { height: 25px; width: 25px; } + &.actionActive { background-color: #9C9; } + &.actionInactive { background-color: #CCC; } + &.pointSelectButton { - background-image: url(../../images/pointSelect.png); + background-image: url('../../images/pointSelect.png'); } } diff --git a/modules/pvw/public/scss/paraview/paraview.surface.scss b/modules/pvw/public/scss/paraview/paraview.surface.scss index 39a36ed9e..58797e920 100644 --- a/modules/pvw/public/scss/paraview/paraview.surface.scss +++ b/modules/pvw/public/scss/paraview/paraview.surface.scss @@ -1,4 +1,4 @@ -/* Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. */ +// Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. #renderercontainer { display: none; diff --git a/modules/pvw/public/scss/paraview/paraview.volume.scss b/modules/pvw/public/scss/paraview/paraview.volume.scss index e6d14df51..5fcffd0dc 100644 --- a/modules/pvw/public/scss/paraview/paraview.volume.scss +++ b/modules/pvw/public/scss/paraview/paraview.volume.scss @@ -1,4 +1,4 @@ -/* Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. */ +// Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. span.infoValue { color: #7A7A7A; @@ -8,13 +8,16 @@ table.extractSubgridTable { td { padding-bottom: 20px; } + input.sb { border: 1px solid #808080; width: 55px; } } -.sliderX, .sliderY, .sliderZ { +.sliderX, +.sliderY, +.sliderZ { margin-left: 11px; margin-right: 11px; width: 370px; @@ -28,24 +31,31 @@ button { margin-right: 10px; width: 32px; } + &.plusX { - background-image: url(../../images/pqXPlus24.png); + background-image: url('../../images/pqXPlus24.png'); } + &.minusX { - background-image: url(../../images/pqXMinus24.png); + background-image: url('../../images/pqXMinus24.png'); } + &.plusY { - background-image: url(../../images/pqYPlus24.png); + background-image: url('../../images/pqYPlus24.png'); } + &.minusY { - background-image: url(../../images/pqYMinus24.png); + background-image: url('../../images/pqYMinus24.png'); } + &.plusZ { - background-image: url(../../images/pqZPlus24.png); + background-image: url('../../images/pqZPlus24.png'); } + &.minusZ { - background-image: url(../../images/pqZMinus24.png); + background-image: url('../../images/pqZMinus24.png'); } + &.cameraPreset:hover { background-color: #ADA; } @@ -56,15 +66,17 @@ div { float: right; margin-top: 15px; } + &.sofPointEdit { display: none; - margin-top: 10px; float: right; + margin-top: 10px; } } input { - &.scalarValueEdit, &.opacityValueEdit { + &.scalarValueEdit, + &.opacityValueEdit { border: 1px solid #808080; margin-left: 5px; margin-right: 10px; @@ -73,7 +85,7 @@ input { } .scmColorPicker { - background: url(../../images/select2.png) -3px -3px; + background: url('../../images/select2.png') -3px -3px; cursor: pointer; display: inline-block; height: 30px; @@ -95,9 +107,11 @@ div { margin-bottom: 10px; margin-top: 10px; } + &.scmDivider { border-top: 1px solid #D7D7D7; } + &.scmBottomButtons { float: right; padding-top: 10px; @@ -112,14 +126,17 @@ button.scmDeletePoint { table.objectList { border-collapse: collapse; width: 100%; + th { - &.visibility { - width: 20px; - } background-color: #D0D0F6; border: 1px solid #808080; padding-left: 4px; + + &.visibility { + width: 20px; + } } + td { border: 1px solid #808080; padding-left: 2px; diff --git a/modules/ratings/public/scss/item/item.ratings.scss b/modules/ratings/public/scss/item/item.ratings.scss index 233801cf9..c47fe715c 100644 --- a/modules/ratings/public/scss/item/item.ratings.scss +++ b/modules/ratings/public/scss/item/item.ratings.scss @@ -1,4 +1,4 @@ -/* Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. */ +// Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. #ratingsAverage { float: left; @@ -14,7 +14,6 @@ div { &.ratingsVSpacer { height: 30px; } - &.ratingCountWrapper {} } span { @@ -22,6 +21,7 @@ span { color: #676767; margin-left: 7px; } + &.addRating { color: #676767; float: left; @@ -35,13 +35,15 @@ div.loginToRate { padding-bottom: 8px; } -#registerToRate, #loginToRate { +#registerToRate, +#loginToRate { color: #56758B; font-weight: bold; text-decoration: none; } -#registerToRate:hover, #loginToRate:hover { +#registerToRate:hover, +#loginToRate:hover { cursor: pointer; text-decoration: underline; } diff --git a/modules/remoteprocessing/public/scss/executable/executable.define.scss b/modules/remoteprocessing/public/scss/executable/executable.define.scss index 9c34861e7..5e89d12fa 100644 --- a/modules/remoteprocessing/public/scss/executable/executable.define.scss +++ b/modules/remoteprocessing/public/scss/executable/executable.define.scss @@ -1,4 +1,4 @@ -/* Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. */ +// Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. #jsonMetadataContent { display: none; @@ -15,22 +15,24 @@ .portlet-header { cursor: move; - margin: 0.3em; + margin: .3em; padding-bottom: 4px; - padding-left: 0.2em; + padding-left: .2em; + .ui-icon { float: right; } } .portlet-content { - padding: 0.4em; + padding: .4em; } .ui-sortable-placeholder { border: 1px dotted #000; height: 50px !important; visibility: visible !important; + * { visibility: hidden; } diff --git a/modules/remoteprocessing/public/scss/index/index.selectaction.scss b/modules/remoteprocessing/public/scss/index/index.selectaction.scss index f528b5b7d..239f7eec6 100644 --- a/modules/remoteprocessing/public/scss/index/index.selectaction.scss +++ b/modules/remoteprocessing/public/scss/index/index.selectaction.scss @@ -1,15 +1,16 @@ -/* Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. */ +// Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. @import 'bourbon'; #selectactionBlock .blockSet { - border-radius: 10px; border: 1px solid #CCC; + border-radius: 10px; cursor: pointer; float: left; margin: 5px; padding: 1px; width: 262px; + &:hover { border: 2px solid #D3E8F8; box-shadow: 1px 2px 4px #B9B9B9; diff --git a/modules/remoteprocessing/public/scss/job/job.init.scss b/modules/remoteprocessing/public/scss/job/job.init.scss index 71a9d4c66..bf0e91251 100644 --- a/modules/remoteprocessing/public/scss/job/job.init.scss +++ b/modules/remoteprocessing/public/scss/job/job.init.scss @@ -1,14 +1,16 @@ -/* Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. */ +// Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. -.optionWrapper, .nameWrapper { - border-radius: 6px; +.optionWrapper, +.nameWrapper { border: #354856 1px solid; + border-radius: 6px; box-shadow: 0 0 5px #666; margin-bottom: 2px; - padding: 0 5px 6px 5px; + padding: 0 5px 6px; } -.optionWrapper h4, .nameWrapper h4 { +.optionWrapper h4, +.nameWrapper h4 { border-bottom: 1px solid #808080; font-size: 14px; margin-bottom: 0; @@ -16,8 +18,8 @@ } #schedulerWrapper { - border-radius: 6px; border: #354856 1px solid; + border-radius: 6px; box-shadow: 0 0 5px #666; margin-bottom: 2px; } @@ -26,7 +28,8 @@ background: #F8F8F8 !important; } -.reviewUploaded form, #wizard { +.reviewUploaded form, +#wizard { display: none; } @@ -42,6 +45,7 @@ #metaWrapper { display: none; + .viewMain { width: 95% !important; } diff --git a/modules/remoteprocessing/public/scss/job/job.manage.scss b/modules/remoteprocessing/public/scss/job/job.manage.scss index 4712c2ceb..f51c4fb81 100644 --- a/modules/remoteprocessing/public/scss/job/job.manage.scss +++ b/modules/remoteprocessing/public/scss/job/job.manage.scss @@ -1,4 +1,4 @@ -/* Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. */ +// Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. .midasTree td { cursor: pointer !important; diff --git a/modules/remoteprocessing/public/scss/job/job.view.scss b/modules/remoteprocessing/public/scss/job/job.view.scss index 219a00e6f..d9e66ec46 100644 --- a/modules/remoteprocessing/public/scss/job/job.view.scss +++ b/modules/remoteprocessing/public/scss/job/job.view.scss @@ -1,11 +1,12 @@ -/* Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. */ +// Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. div.viewWrapper { padding-right: 40px !important; } table { - &#tableResults, &#tableXml { + &#tableResults, + &#tableXml { width: 100%; } } @@ -14,7 +15,7 @@ table { border: #354856 1px solid; border-radius: 6px; box-shadow: 0 0 5px #666; - padding: 5px 10px 25px 10px; + padding: 5px 10px 25px; } table#tableResults td { @@ -22,21 +23,21 @@ table#tableResults td { } #hiddenLog { - border-radius: 6px; border: #354856 1px solid; + border-radius: 6px; box-shadow: 0 0 5px #666; display: none; height: 400px; margin-bottom: 2px; overflow: scroll; - padding: 0 5px 6px 5px; + padding: 0 5px 6px; } #metricsWrapper { - border-radius: 6px; border: #354856 1px solid; + border-radius: 6px; box-shadow: 0 0 5px #666; display: none; margin-bottom: 2px; - padding: 0 5px 6px 5px; + padding: 0 5px 6px; } diff --git a/modules/remoteprocessing/public/scss/layout/remoteprocessing.scss b/modules/remoteprocessing/public/scss/layout/remoteprocessing.scss index 2331b98f0..6d119b90c 100644 --- a/modules/remoteprocessing/public/scss/layout/remoteprocessing.scss +++ b/modules/remoteprocessing/public/scss/layout/remoteprocessing.scss @@ -1,9 +1,10 @@ -/* Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. */ +// Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. @import 'bourbon'; div.HeaderAction ul li.processButton { @include linear-gradient(to bottom, #578DBB, #325372); + &:hover { @include linear-gradient(to bottom, #5B7AD2, #42779D); } diff --git a/modules/sizequota/public/scss/folder/folder.index.scss b/modules/sizequota/public/scss/folder/folder.index.scss index 20fd06337..2b6ce3161 100644 --- a/modules/sizequota/public/scss/folder/folder.index.scss +++ b/modules/sizequota/public/scss/folder/folder.index.scss @@ -1,4 +1,4 @@ -/* Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. */ +// Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. #hFreeSpaceValue { display: none; diff --git a/modules/solr/public/scss/admin/admin.index.scss b/modules/solr/public/scss/admin/admin.index.scss index fe0a3f515..10ef34f4e 100644 --- a/modules/solr/public/scss/admin/admin.index.scss +++ b/modules/solr/public/scss/admin/admin.index.scss @@ -1,4 +1,4 @@ -/* Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. */ +// Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. div { &.rebuildIndexContainer { @@ -7,7 +7,7 @@ div { } #rebuildIndexButton { - margin: 10px 0 10px 0 !important; + margin: 10px 0 !important; } #rebuildProgressMessage { diff --git a/modules/solr/public/scss/advanced/advanced.index.scss b/modules/solr/public/scss/advanced/advanced.index.scss index 9d27a0ea3..f9672407c 100644 --- a/modules/solr/public/scss/advanced/advanced.index.scss +++ b/modules/solr/public/scss/advanced/advanced.index.scss @@ -1,12 +1,14 @@ -/* Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. */ +// Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. div { &.viewWrapper { padding-right: 30px !important; } + &.queryArea { margin-top: 10px; } + &.topText { margin-top: 8px; } @@ -20,7 +22,7 @@ div { #advancedSearchButton { margin-left: 0 !important; - padding: 4px 13px 4px 13px; + padding: 4px 13px; } #resultsArea { @@ -39,6 +41,7 @@ div { padding-bottom: 10px; padding-top: 10px; } + &.pageItrButtons { float: right; margin-top: 15px; diff --git a/modules/statistics/public/scss/index/index.index.scss b/modules/statistics/public/scss/index/index.index.scss index cb699d7ef..3efb548ca 100644 --- a/modules/statistics/public/scss/index/index.index.scss +++ b/modules/statistics/public/scss/index/index.index.scss @@ -1,9 +1,10 @@ -/* Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. */ +// Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. div { &.viewSideBar input.globalButton { margin-left: 0 !important; } + &.viewWrapper { padding-right: 40px !important; } diff --git a/modules/statistics/public/scss/item/item.index.scss b/modules/statistics/public/scss/item/item.index.scss index a0a93c501..dd1ba52ce 100644 --- a/modules/statistics/public/scss/item/item.index.scss +++ b/modules/statistics/public/scss/item/item.index.scss @@ -1,16 +1,17 @@ -/* Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. */ +// Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. div { &.viewSideBar input.globalButton { margin-left: 0 !important; } + &.viewWrapper { padding-right: 40px !important; } } input.dateSelect { - background: #FFF url(../../images/calendar.png) no-repeat scroll 2px 0; + background: #FFF url('../../images/calendar.png') no-repeat scroll 2px 0; border: 1px solid #808080; padding-left: 20px; } @@ -28,25 +29,27 @@ input.dateSelect { input.filterButton { background: #F6F9FE; + border: 1px solid #808080; -moz-box-align: center; -webkit-box-align: center; - border: 1px solid #808080; box-sizing: border-box; color: #2E6E9E; cursor: pointer; font-weight: bold; line-height: 1.4; - margin-right: 0.1em; + margin-right: .1em; overflow: visible; position: relative; text-align: center; text-decoration: none !important; zoom: 1; + &:hover { background: #CBD9E3 none; color: #1D5987; text-decoration: none; } + &[disabled] { background: #DBDBDB none; color: #808080; @@ -65,6 +68,7 @@ span { color: #959595; font-weight: lighter; } + &#filteredCount { display: inline-block; padding-top: 5px; diff --git a/modules/thumbnailcreator/public/scss/admin/admin.index.scss b/modules/thumbnailcreator/public/scss/admin/admin.index.scss index 252edf028..a48c7151c 100644 --- a/modules/thumbnailcreator/public/scss/admin/admin.index.scss +++ b/modules/thumbnailcreator/public/scss/admin/admin.index.scss @@ -1 +1 @@ -/* Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. */ +// Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. diff --git a/modules/thumbnailcreator/public/scss/item/thumbnailcreator.item.view.scss b/modules/thumbnailcreator/public/scss/item/thumbnailcreator.item.view.scss index 309166467..72620c15e 100644 --- a/modules/thumbnailcreator/public/scss/item/thumbnailcreator.item.view.scss +++ b/modules/thumbnailcreator/public/scss/item/thumbnailcreator.item.view.scss @@ -1,4 +1,4 @@ -/* Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. */ +// Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. img { &.makeThumbnailIcon { @@ -7,6 +7,7 @@ img { padding-left: 2px; padding-right: 2px; } + &.largeImage { padding-top: 10px; } diff --git a/modules/tracker/public/scss/producer/producer.edit.scss b/modules/tracker/public/scss/producer/producer.edit.scss index d21ffdcc6..ce00268d6 100644 --- a/modules/tracker/public/scss/producer/producer.edit.scss +++ b/modules/tracker/public/scss/producer/producer.edit.scss @@ -1,4 +1,4 @@ -/* Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. */ +// Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. div.submitButtonContainer { float: right; diff --git a/modules/tracker/public/scss/producer/producer.list.scss b/modules/tracker/public/scss/producer/producer.list.scss index 661e785b4..21ab0fe0d 100644 --- a/modules/tracker/public/scss/producer/producer.list.scss +++ b/modules/tracker/public/scss/producer/producer.list.scss @@ -1,28 +1,34 @@ -/* Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. */ +// Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. div { &.introText { margin-bottom: 20px; } + &.producerList a.producerLink { font-size: 18px; font-weight: bold; text-decoration: none; + &:hover { text-decoration: underline; } } + &.noProducers { font-style: italic; } + &.producerDescription { margin-top: 6px; } + &.producerContainer { border-top: 1px solid #D7D7D7; margin-top: 20px; padding-top: 8px; } + &.createProducerContainer { border-top: 1px solid #D7D7D7; margin-top: 20px; @@ -34,6 +40,7 @@ form.createProducer { input[type=text] { width: 300px; } + textarea { resize: none; width: 298px; diff --git a/modules/tracker/public/scss/producer/producer.view.scss b/modules/tracker/public/scss/producer/producer.view.scss index b6998317a..20770b356 100644 --- a/modules/tracker/public/scss/producer/producer.view.scss +++ b/modules/tracker/public/scss/producer/producer.view.scss @@ -1,4 +1,4 @@ -/* Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. */ +// Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. div { &.producerInfoContainer { @@ -6,21 +6,26 @@ div { margin-bottom: 6px; padding-bottom: 4px; } - &.producerData, &.datasetHeader { + + &.producerData, + &.datasetHeader { color: #777; margin-bottom: 6px; } + &.sectionTitle { color: #707070; font-size: 18px; margin-bottom: 8px; } + &.trendGroupContainer { - border-radius: 5px; border: 1px solid #A7A7A7; + border-radius: 5px; margin-bottom: 15px; padding: 6px; } + &.headerSeparator { background-color: #D7D7D7; height: 1px; @@ -28,11 +33,13 @@ div { margin-top: 8px; width: 100%; } + &.trendContainer { color: #56758B; font-size: 14px; margin-bottom: 2px; - input[type="checkbox"] { + + input[type='checkbox'] { position: relative; top: 1px; } @@ -47,6 +54,7 @@ a.trendLink { padding-left: 3px; padding-top: 3px; width: 90%; + &:hover { background-color: #E5E5E5; color: #16354B; diff --git a/modules/tracker/public/scss/scalar/scalar.details.scss b/modules/tracker/public/scss/scalar/scalar.details.scss index dad4ae722..77a95eb22 100644 --- a/modules/tracker/public/scss/scalar/scalar.details.scss +++ b/modules/tracker/public/scss/scalar/scalar.details.scss @@ -1,4 +1,4 @@ -/* Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. */ +// Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. div.sectionDivider { background-color: #C7C7C7; @@ -22,6 +22,7 @@ div { &.thisScalarInfo { margin-bottom: 13px; } + &.otherScalars { margin-bottom: 15px; } @@ -33,11 +34,13 @@ span.resultItemLabel { } table { - &.scalarInfoTable th, &.otherScalarTable th { + &.scalarInfoTable th, + &.otherScalarTable th { color: #555; font-weight: bold; padding-right: 6px; } + &.otherScalarTable td { text-align: right; } @@ -47,6 +50,7 @@ div { &.resultItemContainer { margin-top: 3px; } + &.bottomButtons { float: right; margin-top: 10px; diff --git a/modules/tracker/public/scss/trend/trend.edit.scss b/modules/tracker/public/scss/trend/trend.edit.scss index d19ef5b90..320c1b316 100644 --- a/modules/tracker/public/scss/trend/trend.edit.scss +++ b/modules/tracker/public/scss/trend/trend.edit.scss @@ -1,19 +1,22 @@ -/* Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. */ +// Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. div { &.formWrapper { padding-left: 15px; width: 840px; } + &.editTitle { color: #797979; font-size: 16px; margin-bottom: 12px; margin-top: 8px; } + &.submitButtonContainer { margin-top: 25px; } + &.formRow { margin-bottom: 6px; } @@ -25,7 +28,8 @@ span.noItem { } input { - &.selectItem, &.removeItem { + &.selectItem, + &.removeItem { margin-left: 8px !important; } } diff --git a/modules/tracker/public/scss/trend/trend.notify.scss b/modules/tracker/public/scss/trend/trend.notify.scss index 172d94f57..171795c0f 100644 --- a/modules/tracker/public/scss/trend/trend.notify.scss +++ b/modules/tracker/public/scss/trend/trend.notify.scss @@ -1,4 +1,4 @@ -/* Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. */ +// Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. div.thresholdInfoContainer { margin-top: 10px; @@ -13,6 +13,7 @@ div { float: right; margin-top: 15px; } + &.registeredEmail { color: #797979; margin-top: 10px; diff --git a/modules/tracker/public/scss/trend/trend.view.scss b/modules/tracker/public/scss/trend/trend.view.scss index 4bc7dbb53..6a953198c 100644 --- a/modules/tracker/public/scss/trend/trend.view.scss +++ b/modules/tracker/public/scss/trend/trend.view.scss @@ -1,10 +1,11 @@ -/* Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. */ +// Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. div { &.itemsContainer { margin-bottom: 10px; margin-top: 6px; } + &.dateControlContainer { border-bottom: 1px solid #D7D7D7; margin-bottom: 8px; @@ -13,7 +14,7 @@ div { } input.dateSelect { - background: #FFF url(../../images/calendar.png) no-repeat scroll 2px 1px; + background: #FFF url('../../images/calendar.png') no-repeat scroll 2px 1px; border: 1px solid #808080; box-sizing: border-box; height: 20px; @@ -27,7 +28,8 @@ input.dateSelect { height: 20px; } -#filterButton, #branchFilterButton { +#filterButton, +#branchFilterButton { margin-left: 2px !important; } @@ -40,10 +42,12 @@ span { &.infoItem { color: #979797; } + &.itemLinkNone { color: #A5A5A5; font-style: italic; } + &.noPoints { color: #909090; display: inline-block; @@ -51,7 +55,10 @@ span { } } -.yMin, .yMax, .y2Min, .y2Max { +.yMin, +.yMax, +.y2Min, +.y2Max { margin-left: 10px; margin-right: 10px; width: 70px; @@ -62,10 +69,12 @@ div { float: right; margin-top: 15px; } + &.deleteProgressBar { margin-bottom: 6px; margin-top: 10px; } + &.bottomButtonsDelete { float: right; margin-top: 20px; @@ -73,7 +82,8 @@ div { } input { - &.deleteYes, &.deleteNo { + &.deleteYes, + &.deleteNo { margin-left: 10px !important; } } @@ -97,23 +107,26 @@ div.toggleUnofficialIcon { position: relative; top: 2px; width: 16px; + &.toHide { border: 1px dashed #F22; } + &.toShow { background-color: #F22; } } button.add-branchfilter { - margin-left: 15px; background-color: #6263AA; + border: 0; + border-radius: 2px; color: #FFF; + cursor: pointer; font-weight: bold; - border: none; - border-radius: 2px; + margin-left: 15px; padding: 4px 11px; - cursor: pointer; + &:hover { background-color: #525399; } diff --git a/modules/validation/public/scss/validation.index.scss b/modules/validation/public/scss/validation.index.scss index 7bdea8dc7..a0e9bda64 100644 --- a/modules/validation/public/scss/validation.index.scss +++ b/modules/validation/public/scss/validation.index.scss @@ -1,4 +1,4 @@ -/* Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. */ +// Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. @import 'bourbon'; @@ -7,12 +7,14 @@ div { margin-top: 2px; padding-top: 0; } + &.dashEntry { border-top: 1px solid #DAD8D4; cursor: pointer; padding-bottom: 10px; padding-top: 10px; } + &.grayEntry { background-color: #EEE; } @@ -28,8 +30,8 @@ div { .dashTitle { font-size: 13px; - margin-bottom: 0.67em; - margin-top: 0.67em; + margin-bottom: .67em; + margin-top: .67em; padding-left: 2ex; text-shadow: #FFF 0 1px 1px; vertical-align: middle; @@ -48,21 +50,23 @@ div.dashPanel { border: 1px dotted #999; margin-right: 2px; padding: 6px 1px 2px; + &:hover { + @include user-select(none); background-color: #EEE; border: 1px dotted #999; cursor: pointer; margin-right: 2px; padding: 6px 1px 2px; - @include user-select(none); } + &:active { + @include user-select(none); background-color: #AAA; border: 1px dotted #999; cursor: pointer; margin-right: 2px; padding: 6px 1px 2px; - @include user-select(none); } } diff --git a/modules/visualize/public/scss/media/media.index.scss b/modules/visualize/public/scss/media/media.index.scss index f02a06069..21acb2edd 100644 --- a/modules/visualize/public/scss/media/media.index.scss +++ b/modules/visualize/public/scss/media/media.index.scss @@ -1,4 +1,4 @@ -/* Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. */ +// Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. div.helpContent { background-color: #DDD; diff --git a/modules/visualize/public/scss/paraview/paraview.dual.scss b/modules/visualize/public/scss/paraview/paraview.dual.scss index 96177af85..64860d84b 100644 --- a/modules/visualize/public/scss/paraview/paraview.dual.scss +++ b/modules/visualize/public/scss/paraview/paraview.dual.scss @@ -1,4 +1,4 @@ -/* Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. */ +// Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. div.rendererWrapper { position: relative; @@ -22,14 +22,16 @@ div.rendererWrapper { } img { - &.leftLoading, &.rightLoading { + &.leftLoading, + &.rightLoading { margin-left: 10px; margin-top: 10px; z-index: 100; } } -#leftRendererOverlay, #rightRendererOverlay { +#leftRendererOverlay, +#rightRendererOverlay { position: absolute; right: 3px; top: 3px; @@ -41,10 +43,12 @@ div { position: relative; top: 426px; } + &.sliceControlContainer { position: absolute; width: 424px; } + &.windowControlContainer { left: 425px; position: absolute; @@ -52,11 +56,13 @@ div { } } -#windowSlider, #sliceSlider { +#windowSlider, +#sliceSlider { margin: 8px 14px 8px 15px; } -#windowInfo, #sliceInfo { +#windowInfo, +#sliceInfo { margin-left: 15px; } @@ -68,24 +74,30 @@ button { margin-top: 10px; width: 25px; } + &.actionActive { background-color: #9C9; } + &.actionInactive { background-color: #CCC; } + &.pointSelectButton { - background-image: url(../../images/pointSelect.png); + background-image: url('../../images/pointSelect.png'); } + &.pointMapListButton { - background-image: url(../../images/pqNodeSetData16.png); + background-image: url('../../images/pqNodeSetData16.png'); } + &.cameraLinkButton { - background-image: url(../../images/camera_link.png); + background-image: url('../../images/camera_link.png'); } } -#leftLoadingStatus, #rightLoadingStatus { +#leftLoadingStatus, +#rightLoadingStatus { margin-left: 10px; } @@ -96,18 +108,21 @@ span.infoValue { .pointListTable { border-collapse: collapse; width: 100%; + th { background-color: #CDD; border: 1px solid #A0A0A0; padding: 5px 3px 5px 5px; } + tbody tr { border-bottom: 1px dotted #A0A0A0; } } div { - &.colorSwatchL, &.colorSwatchR { + &.colorSwatchL, + &.colorSwatchR { border: 1px solid #707070; display: inline-block; height: 14px; @@ -119,20 +134,28 @@ div { } button { - &.highlightPoints, &.deletePoints, &.processButton, &.closeButton { + &.highlightPoints, + &.deletePoints, + &.processButton, + &.closeButton { background-color: #F0F0F0; - border-radius: 1px; border: 1px solid #B0B0B0; - padding: 3px 6px 3px 6px; + border-radius: 1px; + padding: 3px 6px; } - &.highlightPoints:hover, &.deletePoints:hover, &.processButton:hover, &.closeButton:hover { + + &.highlightPoints:hover, + &.deletePoints:hover, + &.processButton:hover, + &.closeButton:hover { background-color: #DADADA; border: 1px solid #808080; } + &.highlightOn { background-color: #CDF9CD !important; - border-radius: 2px; border: 1px solid #B0B0B0; + border-radius: 2px; } } diff --git a/modules/visualize/public/scss/paraview/paraview.slice.scss b/modules/visualize/public/scss/paraview/paraview.slice.scss index 68aed5569..bfd857f4b 100644 --- a/modules/visualize/public/scss/paraview/paraview.slice.scss +++ b/modules/visualize/public/scss/paraview/paraview.slice.scss @@ -1,11 +1,13 @@ -/* Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. */ +// Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. -#sliceSlider, #windowLevelSlider { +#sliceSlider, +#windowLevelSlider { margin: 8px 14px 8px 10px; width: 551px; } -#sliceInfo, #windowLevelInfo { +#sliceInfo, +#windowLevelInfo { color: #FFF; margin-left: 10px; z-index: 3; @@ -51,14 +53,17 @@ button { height: 25px; width: 25px; } + &.actionActive { background-color: #9C9; } + &.actionInactive { background-color: #CCC; } + &.pointSelectButton { - background-image: url(../../images/pointSelect.png); + background-image: url('../../images/pointSelect.png'); } } diff --git a/modules/visualize/public/scss/paraview/paraview.surface.scss b/modules/visualize/public/scss/paraview/paraview.surface.scss index 39a36ed9e..58797e920 100644 --- a/modules/visualize/public/scss/paraview/paraview.surface.scss +++ b/modules/visualize/public/scss/paraview/paraview.surface.scss @@ -1,4 +1,4 @@ -/* Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. */ +// Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. #renderercontainer { display: none; diff --git a/modules/visualize/public/scss/paraview/paraview.volume.scss b/modules/visualize/public/scss/paraview/paraview.volume.scss index 60a2c9010..f8708b700 100644 --- a/modules/visualize/public/scss/paraview/paraview.volume.scss +++ b/modules/visualize/public/scss/paraview/paraview.volume.scss @@ -1,4 +1,4 @@ -/* Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. */ +// Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. #renderercontainer { display: none; @@ -30,13 +30,16 @@ table.extractSubgridTable { td { padding-bottom: 20px; } + input.sb { border: 1px solid #808080; width: 55px; } } -.sliderX, .sliderY, .sliderZ { +.sliderX, +.sliderY, +.sliderZ { margin-left: 11px; margin-right: 11px; width: 370px; @@ -50,24 +53,31 @@ button { margin-right: 10px; width: 32px; } + &.plusX { - background-image: url(../../images/pqXPlus24.png); + background-image: url('../../images/pqXPlus24.png'); } + &.minusX { - background-image: url(../../images/pqXMinus24.png); + background-image: url('../../images/pqXMinus24.png'); } + &.plusY { - background-image: url(../../images/pqYPlus24.png); + background-image: url('../../images/pqYPlus24.png'); } + &.minusY { - background-image: url(../../images/pqYMinus24.png); + background-image: url('../../images/pqYMinus24.png'); } + &.plusZ { - background-image: url(../../images/pqZPlus24.png); + background-image: url('../../images/pqZPlus24.png'); } + &.minusZ { - background-image: url(../../images/pqZMinus24.png); + background-image: url('../../images/pqZMinus24.png'); } + &.cameraPreset:hover { background-color: #ADA; } @@ -78,15 +88,17 @@ div { float: right; margin-top: 15px; } + &.sofPointEdit { display: none; - margin-top: 10px; float: right; + margin-top: 10px; } } input { - &.scalarValueEdit, &.opacityValueEdit { + &.scalarValueEdit, + &.opacityValueEdit { border: 1px solid #808080; margin-left: 5px; margin-right: 10px; @@ -95,7 +107,7 @@ input { } .scmColorPicker { - background: url(../../images/select2.png) -3px -3px; + background: url('../../images/select2.png') -3px -3px; cursor: pointer; display: inline-block; height: 30px; @@ -117,9 +129,11 @@ div { margin-bottom: 10px; margin-top: 10px; } + &.scmDivider { border-top: 1px solid #D7D7D7; } + &.scmBottomButtons { float: right; padding-top: 10px; @@ -134,14 +148,17 @@ button.scmDeletePoint { table.objectList { border-collapse: collapse; width: 100%; + th { - &.visibility { - width: 20px; - } background-color: #D0D0F6; border: 1px solid #808080; padding-left: 4px; + + &.visibility { + width: 20px; + } } + td { border: 1px solid #808080; padding-left: 2px; diff --git a/modules/visualize/public/scss/webgl/webgl.index.scss b/modules/visualize/public/scss/webgl/webgl.index.scss index 3970d9855..56f91c77d 100644 --- a/modules/visualize/public/scss/webgl/webgl.index.scss +++ b/modules/visualize/public/scss/webgl/webgl.index.scss @@ -1,76 +1,84 @@ -/* Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. */ +// Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. @import 'bourbon'; body { - @include linear-gradient(to bottom, #336699, #72B9FF); + @include linear-gradient(to bottom, #369, #72B9FF); color: #EEE; - padding: 0; - margin: 0; - font-weight: bold; - overflow: hidden; font-family: $monospace; font-size: 13px; + font-weight: bold; + margin: 0; + overflow: hidden; + padding: 0; text-align: center; } #info { - position: absolute; bottom: 0; - width: 100%; padding: 5px; + position: absolute; + width: 100%; z-index: 100; } #onliver { + color: #FFF; + padding: 5px; position: absolute; top: 70px; width: 100%; - padding: 5px; z-index: 100; - color: #FFF; } #helpDialog1 { text-align: left; } -a, b { +a, +b { color: #008000; } button { &.buttonNav { + border-image: initial; + box-shadow: 0 0 15px #666; height: 20px !important; - width: 20px !important; position: absolute !important; - box-shadow: 0 0 15px #666; - border-image: initial; + width: 20px !important; } + &#buttonUp { left: 50px; top: 100px; } + &#buttonDown { left: 50px; top: 150px; } + &#buttonLeft { left: 25px; top: 125px; } + &#buttonRight { left: 75px; top: 125px; } + &#buttonReset { left: 50px; top: 125px; } + &#buttonPlus { left: 50px; top: 180px; } + &#buttonMinus { left: 50px; top: 205px; @@ -78,6 +86,6 @@ button { } div#axesContainer { - position: absolute; bottom: 0; + position: absolute; } diff --git a/utils/moduleTemplate/public/scss/thing/thing.get.scss b/utils/moduleTemplate/public/scss/thing/thing.get.scss index 252edf028..a48c7151c 100644 --- a/utils/moduleTemplate/public/scss/thing/thing.get.scss +++ b/utils/moduleTemplate/public/scss/thing/thing.get.scss @@ -1 +1 @@ -/* Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. */ +// Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. From 71a038caf6462bfe87688768dca8ac948dfb1e35 Mon Sep 17 00:00:00 2001 From: Jamie Snape Date: Thu, 8 Oct 2015 15:38:34 -0400 Subject: [PATCH 5/5] Add updated CSS files --- core/public/css/admin/admin.dashboard.css | 2 +- core/public/css/admin/admin.index.css | 2 +- core/public/css/admin/admin.migrate.css | 2 +- core/public/css/admin/admin.upgrade.css | 2 +- core/public/css/assetstore/assetstore.add.css | 2 +- core/public/css/assetstore/assetstore.movedialog.css | 2 +- core/public/css/browse/browse.index.css | 2 +- core/public/css/browse/browse.movecopy.css | 2 +- core/public/css/browse/browse.selectfolder.css | 2 +- core/public/css/browse/browse.selectitem.css | 2 +- core/public/css/common/common.browser.css | 2 +- core/public/css/common/common.feed.css | 2 +- core/public/css/common/common.genericPage.css | 2 +- core/public/css/common/common.listfiles.css | 2 +- core/public/css/community/community.create.css | 2 +- core/public/css/community/community.index.css | 2 +- core/public/css/community/community.invitation.css | 2 +- core/public/css/community/community.manage.css | 2 +- core/public/css/community/community.promotedialog.css | 2 +- core/public/css/community/community.selectgroup.css | 2 +- core/public/css/community/community.view.css | 2 +- core/public/css/error/error.error.css | 2 +- core/public/css/feed/feed.index.css | 2 +- core/public/css/folder/folder.createfolder.css | 2 +- core/public/css/folder/folder.edit.css | 2 +- core/public/css/folder/folder.view.css | 2 +- core/public/css/import/import.index.css | 2 +- core/public/css/install/install.css | 2 +- core/public/css/install/install.step2.css | 2 +- core/public/css/item/item.edit.css | 2 +- core/public/css/item/item.editbitstream.css | 2 +- core/public/css/item/item.editmetadata.css | 2 +- core/public/css/item/item.view.css | 2 +- core/public/css/layout/form.css | 2 +- core/public/css/layout/jquery.treeTable.css | 2 +- core/public/css/layout/loginForm.css | 2 +- core/public/css/layout/midas.empty.css | 2 +- core/public/css/layout/midas.layout.css | 2 +- core/public/css/layout/view.css | 2 +- core/public/css/licenses/licenses.index.css | 2 +- core/public/css/rest/rest.index.css | 2 +- core/public/css/search/search.index.css | 2 +- core/public/css/share/share.dialog.css | 2 +- core/public/css/share/share.links.css | 2 +- core/public/css/upload/upload.revision.css | 2 +- core/public/css/upload/upload.simpleupload.css | 2 +- core/public/css/user/user.deletedialog.css | 2 +- core/public/css/user/user.emailregister.css | 2 +- core/public/css/user/user.index.css | 2 +- core/public/css/user/user.manage.css | 2 +- core/public/css/user/user.register.css | 2 +- core/public/css/user/user.settings.css | 2 +- core/public/css/user/user.userpage.css | 2 +- modules/api/public/css/index/index.index.css | 2 +- modules/archive/public/css/extract/extract.dialog.css | 2 +- modules/cleanup/public/css/item/index.index.css | 2 +- modules/comments/public/css/item/item.comments.css | 2 +- .../public/css/community/community.agreementdialog.css | 2 +- .../public/css/community/community.agreementtab.css | 2 +- modules/dicomanonymize/public/css/upload/upload.index.css | 2 +- modules/dicomserver/public/css/admin/admin.index.css | 2 +- .../javauploaddownload/public/css/download/download.index.css | 2 +- modules/javauploaddownload/public/css/upload/upload.index.css | 2 +- .../javauploaddownload/public/css/upload/upload.revision.css | 2 +- modules/keyfiles/public/css/item/keyfiles.item.view.css | 2 +- modules/mfa/public/css/config/config.index.css | 2 +- modules/mfa/public/css/config/config.usertab.css | 2 +- modules/mfa/public/css/login/login.dialog.css | 2 +- modules/oauth/public/css/authorize/authorize.index.css | 2 +- modules/oauth/public/css/client/client.index.css | 2 +- .../public/css/application/packages.application.latest.css | 2 +- .../public/css/application/packages.application.view.css | 2 +- modules/packages/public/css/package/package.manage.css | 2 +- modules/packages/public/css/view/packages.view.project.css | 2 +- modules/pvw/public/css/admin/admin.status.css | 2 +- modules/pvw/public/css/paraview/paraview.common.css | 2 +- modules/pvw/public/css/paraview/paraview.slice.css | 2 +- modules/pvw/public/css/paraview/paraview.surface.css | 2 +- modules/pvw/public/css/paraview/paraview.volume.css | 2 +- modules/ratings/public/css/item/item.ratings.css | 2 +- .../public/css/executable/executable.define.css | 2 +- .../remoteprocessing/public/css/index/index.selectaction.css | 2 +- modules/remoteprocessing/public/css/job/job.init.css | 2 +- modules/remoteprocessing/public/css/job/job.manage.css | 2 +- modules/remoteprocessing/public/css/job/job.view.css | 2 +- modules/remoteprocessing/public/css/layout/remoteprocessing.css | 2 +- modules/sizequota/public/css/folder/folder.index.css | 2 +- modules/solr/public/css/admin/admin.index.css | 2 +- modules/solr/public/css/advanced/advanced.index.css | 2 +- modules/statistics/public/css/index/index.index.css | 2 +- modules/statistics/public/css/item/item.index.css | 2 +- .../public/css/item/thumbnailcreator.item.view.css | 2 +- modules/tracker/public/css/producer/producer.edit.css | 2 +- modules/tracker/public/css/producer/producer.list.css | 2 +- modules/tracker/public/css/producer/producer.view.css | 2 +- modules/tracker/public/css/trend/trend.edit.css | 2 +- modules/tracker/public/css/trend/trend.notify.css | 2 +- modules/tracker/public/css/trend/trend.view.css | 2 +- modules/validation/public/css/validation.index.css | 2 +- modules/visualize/public/css/media/media.index.css | 2 +- modules/visualize/public/css/paraview/paraview.dual.css | 2 +- modules/visualize/public/css/paraview/paraview.slice.css | 2 +- modules/visualize/public/css/paraview/paraview.surface.css | 2 +- modules/visualize/public/css/paraview/paraview.volume.css | 2 +- modules/visualize/public/css/webgl/webgl.index.css | 2 +- 105 files changed, 105 insertions(+), 105 deletions(-) diff --git a/core/public/css/admin/admin.dashboard.css b/core/public/css/admin/admin.dashboard.css index 0aea63353..686081e66 100644 --- a/core/public/css/admin/admin.dashboard.css +++ b/core/public/css/admin/admin.dashboard.css @@ -1 +1 @@ -.databaseIntegrityWrapper{border-top:1px solid #d7d7d7;margin-top:5px;padding-top:10px;}.databaseIntegrityWrapper ul{list-style-type:none;margin-left:0;padding-left:0;}.sectionHeader{padding-bottom:1ex;}.integrityButton{position:absolute;right:200px;}#cleanupProgressMessage{margin-top:10px;}.integrityItem{margin:6px;} +.databaseIntegrityWrapper{border-top:1px solid #d7d7d7;margin-top:5px;padding-top:10px}.databaseIntegrityWrapper ul{list-style-type:none;margin-left:0;padding-left:0}.sectionHeader{padding-bottom:1ex}.integrityButton{position:absolute;right:200px}#cleanupProgressMessage{margin-top:10px}.integrityItem{margin:6px} diff --git a/core/public/css/admin/admin.index.css b/core/public/css/admin/admin.index.css index 6d86f2113..5fcb003d4 100644 --- a/core/public/css/admin/admin.index.css +++ b/core/public/css/admin/admin.index.css @@ -1 +1 @@ -div.viewSideBar input.globalButton{margin-left:0 !important;}div.viewWrapper{padding-right:40px !important;}div.assetstoreElement{border-bottom:1px solid #d0d0d0;margin-bottom:10px;padding-bottom:8px;}div.assetstoreNameContainer{font-size:14px;font-weight:bold;margin-bottom:4px;}div.assetstoreActions{margin-top:5px;}.errorText,.freeSpaceWarning{color:#f00;}tr.moduleElementError td{color:#808080;font-size:11px;}a.moduleVisibleCategoryLink,a.moduleHiddenCategoryLink{font-size:13px !important;font-weight:bold !important;}#newassetstore-form{padding:10px;}div.addAssetstoreFormError{margin-bottom:9px;} +div.viewSideBar input.globalButton{margin-left:0 !important}div.viewWrapper{padding-right:40px !important}div.assetstoreElement{border-bottom:1px solid #d0d0d0;margin-bottom:10px;padding-bottom:8px}div.assetstoreNameContainer{font-size:14px;font-weight:bold;margin-bottom:4px}div.assetstoreActions{margin-top:5px}.errorText,.freeSpaceWarning{color:#f00}tr.moduleElementError td{color:#808080;font-size:11px}a.moduleVisibleCategoryLink,a.moduleHiddenCategoryLink{font-size:13px !important;font-weight:bold !important}#newassetstore-form{padding:10px}div.addAssetstoreFormError{margin-bottom:9px} diff --git a/core/public/css/admin/admin.migrate.css b/core/public/css/admin/admin.migrate.css index 5bdca6fbd..2c234df8e 100644 --- a/core/public/css/admin/admin.migrate.css +++ b/core/public/css/admin/admin.migrate.css @@ -1 +1 @@ -h2{margin-left:10px;}form.migrateForm dl{border:0;margin-top:25px;width:800px;}form.migrateForm dl dt{border-bottom:1px solid #eee;float:left;font-weight:bold;height:25px;margin-top:5px;padding-bottom:5px;text-align:right;width:200px;}form.migrateForm dl dd{border-bottom:1px solid #eee;display:inline;float:left;height:25px;margin-left:0;margin-top:5px;padding-bottom:5px;padding-left:20px;text-align:left;width:550px;}#submit-label,#submit-element{border-bottom:0;}.browse-button{left:630px;position:relative;top:-32px;} +h2{margin-left:10px}form.migrateForm dl{border:0;margin-top:25px;width:800px}form.migrateForm dl dt{border-bottom:1px solid #eee;float:left;font-weight:bold;height:25px;margin-top:5px;padding-bottom:5px;text-align:right;width:200px}form.migrateForm dl dd{border-bottom:1px solid #eee;display:inline;float:left;height:25px;margin-left:0;margin-top:5px;padding-bottom:5px;padding-left:20px;text-align:left;width:550px}#submit-label,#submit-element{border-bottom:0}.browse-button{left:630px;position:relative;top:-32px} diff --git a/core/public/css/admin/admin.upgrade.css b/core/public/css/admin/admin.upgrade.css index 125a29255..af0c17150 100644 --- a/core/public/css/admin/admin.upgrade.css +++ b/core/public/css/admin/admin.upgrade.css @@ -1 +1 @@ -div.viewSideBar input.globalButton{margin-left:0 !important;} +div.viewSideBar input.globalButton{margin-left:0 !important} diff --git a/core/public/css/assetstore/assetstore.add.css b/core/public/css/assetstore/assetstore.add.css index d367953d8..8272274e7 100644 --- a/core/public/css/assetstore/assetstore.add.css +++ b/core/public/css/assetstore/assetstore.add.css @@ -1 +1 @@ -form.assetstoreForm{font-size:12px;}form.assetstoreForm dl{margin-top:0;width:250px;}form.assetstoreForm dl dt{clear:both;font-weight:bold;margin-top:5px;text-align:left;}form.assetstoreForm dl dd{border-bottom:1px solid #eee;margin-left:0;padding-bottom:5px;padding-left:5px;padding-top:5px;text-align:left;width:250px;}#addassetstore-label{display:none;}dd.submit-element,#addassetstore-label{border-bottom:0;} +form.assetstoreForm{font-size:12px}form.assetstoreForm dl{margin-top:0;width:250px}form.assetstoreForm dl dt{clear:both;font-weight:bold;margin-top:5px;text-align:left}form.assetstoreForm dl dd{border-bottom:1px solid #eee;margin-left:0;padding-bottom:5px;padding-left:5px;padding-top:5px;text-align:left;width:250px}#addassetstore-label{display:none}dd.submit-element,#addassetstore-label{border-bottom:0} diff --git a/core/public/css/assetstore/assetstore.movedialog.css b/core/public/css/assetstore/assetstore.movedialog.css index b1c48a5f7..57724d9dc 100644 --- a/core/public/css/assetstore/assetstore.movedialog.css +++ b/core/public/css/assetstore/assetstore.movedialog.css @@ -1 +1 @@ -div.bottomButtons{margin-top:15px;float:right;}#moveBitstreamsProgressBar{margin-bottom:6px;margin-top:6px;} +div.bottomButtons{float:right;margin-top:15px}#moveBitstreamsProgressBar{margin-bottom:6px;margin-top:6px} diff --git a/core/public/css/browse/browse.index.css b/core/public/css/browse/browse.index.css index e39122a5b..9fb649678 100644 --- a/core/public/css/browse/browse.index.css +++ b/core/public/css/browse/browse.index.css @@ -1 +1 @@ -div.viewAction,div.viewInfo,div.ajaxInfoElement{display:none;}div.feedThumbnail img{display:none;height:31px;margin-right:4px;width:31px;}.itemSubTitle{margin-bottom:5px;margin-top:0;}div.feedThumbnail a{border:0;}div.itemList span{padding-left:15px;}div.itemBlock{border-bottom:1px dotted #808080;padding-bottom:5px;padding-top:5px;}div.itemBlock:hover{background-color:#f6f9fe;cursor:pointer;}div.itemStats{border:none;color:#777;float:right;font-size:10px;} +div.viewAction,div.viewInfo,div.ajaxInfoElement{display:none}div.feedThumbnail img{display:none;height:31px;margin-right:4px;width:31px}.itemSubTitle{margin-bottom:5px;margin-top:0}div.feedThumbnail a{border:0}div.itemList span{padding-left:15px}div.itemBlock{border-bottom:1px dotted #808080;padding-bottom:5px;padding-top:5px}div.itemBlock:hover{background-color:#f6f9fe;cursor:pointer}div.itemStats{border:0;color:#777;float:right;font-size:10px} diff --git a/core/public/css/browse/browse.movecopy.css b/core/public/css/browse/browse.movecopy.css index 810b921e3..76b9852c1 100644 --- a/core/public/css/browse/browse.movecopy.css +++ b/core/public/css/browse/browse.movecopy.css @@ -1 +1 @@ -table#moveCopyTable{width:420px !important;display:none;}table#moveCopyTable th.thData{border-right:none !important;width:auto !important;}#moveCopyTable .browserPrivacyInformation{right:10px !important;}#moveCopyForm input[type=submit]{margin-left:10px;}div.movecopySubmitWrapper{float:right;margin-top:10px;}div.copySymlinkSelect{margin-bottom:8px;padding-top:6px;}div.destinationDisplay{margin-bottom:8px;} +table#moveCopyTable{display:none;width:420px !important}table#moveCopyTable th.thData{border-right:none !important;width:auto !important}#moveCopyTable .browserPrivacyInformation{right:10px !important}#moveCopyForm input[type=submit]{margin-left:10px}div.movecopySubmitWrapper{float:right;margin-top:10px}div.copySymlinkSelect{margin-bottom:8px;padding-top:6px}div.destinationDisplay{margin-bottom:8px} diff --git a/core/public/css/browse/browse.selectfolder.css b/core/public/css/browse/browse.selectfolder.css index 5a8725665..624fde7c6 100644 --- a/core/public/css/browse/browse.selectfolder.css +++ b/core/public/css/browse/browse.selectfolder.css @@ -1 +1 @@ -table#moveTable{width:420px !important;display:none;}table#moveTable th.thData{border-right:none !important;width:auto !important;}#moveTable .browserPrivacyInformation{right:10px;}#createFolderButton{border:none;display:none;float:none !important;width:200px;}#createFolderContent{border-radius:6px;border:1px #ccd7e0 dotted !important;border:1px #354856 solid;box-shadow:0 0 2px #666;display:none;margin-bottom:2px;margin-top:5px;padding:0 5px 6px 5px;width:300px;}div.bottomButtonsContainer{float:right;margin-top:10px;} +table#moveTable{display:none;width:420px !important}table#moveTable th.thData{border-right:none !important;width:auto !important}#moveTable .browserPrivacyInformation{right:10px}#createFolderButton{border:0;display:none;float:none !important;width:200px}#createFolderContent{border:1px #ccd7e0 dotted !important;border-radius:6px;box-shadow:0 0 2px #666;display:none;margin-bottom:2px;margin-top:5px;padding:0 5px 6px;width:300px}div.bottomButtonsContainer{float:right;margin-top:10px} diff --git a/core/public/css/browse/browse.selectitem.css b/core/public/css/browse/browse.selectitem.css index 2fad152d0..b5580fe6b 100644 --- a/core/public/css/browse/browse.selectitem.css +++ b/core/public/css/browse/browse.selectitem.css @@ -1 +1 @@ -table#moveTable{width:420px !important;display:none;}table#moveTable th.thData{border-right:none !important;width:auto !important;}.treeTable .browserPrivacyInformation{right:10px !important;}div.selectedItemContainer{margin-bottom:5px;}div.bottomButtons{float:right;margin-top:10px;}input#live_search_item{background:#fff url(../../images/icons/search.png) no-repeat scroll 2px 1px;border-radius:4px;border:1px solid #fff;box-shadow:0 0 3px #666;font-size:12px;opacity:0.9;padding:2px 10px 2px 22px;width:260px;}#searchloadingSelectItem{background:url("../../images/icons/loading-small.gif") bottom center no-repeat;color:#fff;display:inline-block;height:16px;margin-left:6px;text-decoration:none;width:16px;} +table#moveTable{display:none;width:420px !important}table#moveTable th.thData{border-right:none !important;width:auto !important}.treeTable .browserPrivacyInformation{right:10px !important}div.selectedItemContainer{margin-bottom:5px}div.bottomButtons{float:right;margin-top:10px}input#live_search_item{background:#fff url('../../images/icons/search.png') no-repeat scroll 2px 1px;border:1px solid #fff;border-radius:4px;box-shadow:0 0 3px #666;font-size:12px;opacity:0.9;padding:2px 10px 2px 22px;width:260px}#searchloadingSelectItem{background:url('../../images/icons/loading-small.gif') bottom center no-repeat;color:#fff;display:inline-block;height:16px;margin-left:6px;text-decoration:none;width:16px} diff --git a/core/public/css/common/common.browser.css b/core/public/css/common/common.browser.css index c9ba9850b..deb936797 100644 --- a/core/public/css/common/common.browser.css +++ b/core/public/css/common/common.browser.css @@ -1 +1 @@ -span.infoTitle{font-weight:bold;word-wrap:break-word;}input.deleteSelectedYes{margin-left:0 !important;}input.deleteSelectedNo{margin-left:15px !important;}div.dialogButtons{float:right;}#deleteSelectedLoadingGif{display:none;float:left;} +span.infoTitle{font-weight:bold;word-wrap:break-word}input.deleteSelectedYes{margin-left:0 !important}input.deleteSelectedNo{margin-left:15px !important}div.dialogButtons{float:right}#deleteSelectedLoadingGif{display:none;float:left} diff --git a/core/public/css/common/common.feed.css b/core/public/css/common/common.feed.css index 0a1eb778b..ce1cf2f36 100644 --- a/core/public/css/common/common.feed.css +++ b/core/public/css/common/common.feed.css @@ -1 +1 @@ -div.feedContainer div.feedElement{border-bottom:1px dotted #e4e4e4;min-height:30px;position:relative;}div.feedContainer div.feedUserImage{float:left;}div.feedContainer div.feedDate{bottom:0;color:#808080;font-size:10px;position:absolute;right:0;}img.feedDeleteLink{cursor:pointer;display:none;height:10px;text-align:center;vertical-align:middle;width:10px;}div.feedDelete{height:10px;position:absolute;right:0;top:0;width:10px;}img.newFeedElement{float:right;position:relative;left:-13px;top:2px;} +div.feedContainer div.feedElement{border-bottom:1px dotted #e4e4e4;min-height:30px;position:relative}div.feedContainer div.feedUserImage{float:left}div.feedContainer div.feedDate{bottom:0;color:#808080;font-size:10px;position:absolute;right:0}img.feedDeleteLink{cursor:pointer;display:none;height:10px;text-align:center;vertical-align:middle;width:10px}div.feedDelete{height:10px;position:absolute;right:0;top:0;width:10px}img.newFeedElement{float:right;left:-13px;position:relative;top:2px} diff --git a/core/public/css/common/common.genericPage.css b/core/public/css/common/common.genericPage.css index 89c180ae8..11c52b704 100644 --- a/core/public/css/common/common.genericPage.css +++ b/core/public/css/common/common.genericPage.css @@ -1 +1 @@ -div.tabs{display:none;}div.genericThumbnail{float:left;}div.genericInfo{height:40px;}div.genericAction{border-bottom:1px solid #fff;padding-bottom:10px;}div.genericAction ul{list-style:none;margin:0;padding:0;}div.genericCommunities{border-bottom:1px solid #fff;border-top:1px solid #dad8d4;padding-bottom:10px;}div.genericCommunities ul{list-style:none;margin:0;padding:0;}div.genericStats{border-top:1px solid #dad8d4;}div.viewAction,div.viewInfo{display:none;}div.genericInfo .genericName{font-size:16px;font-weight:bold;}div.genericInfo .genericSubtitle{font-weight:bold;} +div.tabs{display:none}div.genericThumbnail{float:left}div.genericInfo{height:40px}div.genericAction{border-bottom:1px solid #fff;padding-bottom:10px}div.genericAction ul{list-style:none;margin:0;padding:0}div.genericCommunities{border-bottom:1px solid #fff;border-top:1px solid #dad8d4;padding-bottom:10px}div.genericCommunities ul{list-style:none;margin:0;padding:0}div.genericStats{border-top:1px solid #dad8d4}div.viewAction,div.viewInfo{display:none}div.genericInfo .genericName{font-size:16px;font-weight:bold}div.genericInfo .genericSubtitle{font-weight:bold} diff --git a/core/public/css/common/common.listfiles.css b/core/public/css/common/common.listfiles.css index 8da7ecd1b..c27fd9c23 100644 --- a/core/public/css/common/common.listfiles.css +++ b/core/public/css/common/common.listfiles.css @@ -1 +1 @@ -div.listFilesContainer div.fileElement{border-bottom:1px dotted #e4e4e4;min-height:30px;position:relative;}div.listFilesContainer div.fileDate{bottom:0;color:#808080;font-size:10px;position:absolute;right:0;}div.listFilesContainer div.feedUserImage{float:left;} +div.listFilesContainer div.fileElement{border-bottom:1px dotted #e4e4e4;min-height:30px;position:relative}div.listFilesContainer div.fileDate{bottom:0;color:#808080;font-size:10px;position:absolute;right:0}div.listFilesContainer div.feedUserImage{float:left} diff --git a/core/public/css/community/community.create.css b/core/public/css/community/community.create.css index b281b83e4..d71478b7c 100644 --- a/core/public/css/community/community.create.css +++ b/core/public/css/community/community.create.css @@ -1 +1 @@ -form#createCommunityForm label{width:100px !important;}form#createCommunityForm div.radioElement label{float:inherit !important;width:400px !important;}form#createCommunityForm div.radioElement ul{list-style:none;margin:0 0 0 100px;padding:0 0 0 0;width:300px !important;}form#createCommunityForm div.radioElement br{display:none;}form#createCommunityForm div.radioElement h4{margin-bottom:4px;} +form#createCommunityForm label{width:100px !important}form#createCommunityForm div.radioElement label{float:inherit !important;width:400px !important}form#createCommunityForm div.radioElement ul{list-style:none;margin:0 0 0 100px;padding:0;width:300px !important}form#createCommunityForm div.radioElement br{display:none}form#createCommunityForm div.radioElement h4{margin-bottom:4px} diff --git a/core/public/css/community/community.index.css b/core/public/css/community/community.index.css index 823dc3ce2..873aa38e5 100644 --- a/core/public/css/community/community.index.css +++ b/core/public/css/community/community.index.css @@ -1 +1 @@ -div.communityList div{border-bottom:1px dotted #808080;padding-bottom:5px;padding-top:5px;}div.communityList a.communityTitle{font-size:14px;font-weight:bold;}div.communityList span{padding-left:15px;}div.communityBlock:hover{background-color:#f6f9fe;cursor:pointer;} +div.communityList div{border-bottom:1px dotted #808080;padding-bottom:5px;padding-top:5px}div.communityList a.communityTitle{font-size:14px;font-weight:bold}div.communityList span{padding-left:15px}div.communityBlock:hover{background-color:#f6f9fe;cursor:pointer} diff --git a/core/public/css/community/community.invitation.css b/core/public/css/community/community.invitation.css index ce032d4e3..4e5704b41 100644 --- a/core/public/css/community/community.invitation.css +++ b/core/public/css/community/community.invitation.css @@ -1 +1 @@ -input#urlInput{width:300px;}div#permissionsContent a{color:#56758b;cursor:pointer;font-weight:500;text-decoration:none;}div#permissionsContent a:hover{text-decoration:underline;}#live_invitation_search{width:100%;} +input#urlInput{width:300px}div#permissionsContent a{color:#56758b;cursor:pointer;font-weight:500;text-decoration:none}div#permissionsContent a:hover{text-decoration:underline}#live_invitation_search{width:100%} diff --git a/core/public/css/community/community.manage.css b/core/public/css/community/community.manage.css index 87d106fde..c0e8fb2ac 100644 --- a/core/public/css/community/community.manage.css +++ b/core/public/css/community/community.manage.css @@ -1 +1 @@ -div.radioElement label{float:inherit !important;width:600px !important;}div.radioElement ul{list-style:none;margin:0 0 0 100px;padding:0 0 0 0;width:600px !important;}div.radioElement h4{margin-bottom:4px;}div.radioElement br{display:none;}img.folderLoading{display:none;}h1{padding:0.2em;margin:0;}#products{float:left;margin-right:2em;width:500px;}#cart{float:left;width:200px;}#cart ol{margin:0;padding:1em 0 1em 3em;}span.userDataTitle{font-size:14px;font-weight:bold;line-height:150%;text-shadow:#fff 0 1px 1px;}.notdraggable{cursor:default;}.ui-draggable{cursor:pointer;}div.userPersonalData{opacity:0.9;}img.tableActions{height:14px;margin-left:5px;}a.tableActions{text-decoration:none;}span.actionsList{float:right;}div.extraManageFormContent{margin-bottom:15px;margin-top:15px;}#description{resize:none;width:100%;}div.descriptionArea{margin-top:15px;} +div.radioElement label{float:inherit !important;width:600px !important}div.radioElement ul{list-style:none;margin:0 0 0 100px;padding:0;width:600px !important}div.radioElement h4{margin-bottom:4px}div.radioElement br{display:none}img.folderLoading{display:none}h1{margin:0;padding:0.2em}#products{float:left;margin-right:2em;width:500px}#cart{float:left;width:200px}#cart ol{margin:0;padding:1em 0 1em 3em}span.userDataTitle{font-size:14px;font-weight:bold;line-height:150%;text-shadow:#fff 0 1px 1px}.notdraggable{cursor:default}.ui-draggable{cursor:pointer}div.userPersonalData{opacity:0.9}img.tableActions{height:14px;margin-left:5px}a.tableActions{text-decoration:none}span.actionsList{float:right}div.extraManageFormContent{margin-bottom:15px;margin-top:15px}#description{resize:none;width:100%}div.descriptionArea{margin-top:15px} diff --git a/core/public/css/community/community.promotedialog.css b/core/public/css/community/community.promotedialog.css index c4b97f6c1..7bb2fe725 100644 --- a/core/public/css/community/community.promotedialog.css +++ b/core/public/css/community/community.promotedialog.css @@ -1 +1 @@ -input.addToGroupsSubmit{float:right;}img#promoteDialogLoading{float:left;} +input.addToGroupsSubmit{float:right}img#promoteDialogLoading{float:left} diff --git a/core/public/css/community/community.selectgroup.css b/core/public/css/community/community.selectgroup.css index 9dd0c0c64..cc26d981c 100644 --- a/core/public/css/community/community.selectgroup.css +++ b/core/public/css/community/community.selectgroup.css @@ -1 +1 @@ -div.bottomButtons{float:right;margin-top:13px;}#groupSelect{margin-top:10px;width:100%;} +div.bottomButtons{float:right;margin-top:13px}#groupSelect{margin-top:10px;width:100%} diff --git a/core/public/css/community/community.view.css b/core/public/css/community/community.view.css index 6e5c21276..b439306d2 100644 --- a/core/public/css/community/community.view.css +++ b/core/public/css/community/community.view.css @@ -1 +1 @@ -div.viewSideBar input.globalButton{margin-left:0 !important;}.genericInfo{margin-left:35px;margin-top:5px;}div.genericInfo .genericSubtitle{font-weight:normal;}div.genericBigButton input{background-color:#fff;background-image:-webkit-linear-gradient(top, #fff, #c4c4c4);background-image:linear-gradient(to bottom,#fff, #c4c4c4);border:none;cursor:pointer;}div.genericBigButton input:hover{background-color:#bddcc9;background-image:-webkit-linear-gradient(top, #bddcc9, #8ab79b);background-image:linear-gradient(to bottom,#bddcc9, #8ab79b);} +div.viewSideBar input.globalButton{margin-left:0 !important}.genericInfo{margin-left:35px;margin-top:5px}div.genericInfo .genericSubtitle{font-weight:normal}div.genericBigButton input{background-color:#fff;background-image:-webkit-linear-gradient(top, #fff, #c4c4c4);background-image:linear-gradient(to bottom,#fff, #c4c4c4);border:0;cursor:pointer}div.genericBigButton input:hover{background-color:#bddcc9;background-image:-webkit-linear-gradient(top, #bddcc9, #8ab79b);background-image:linear-gradient(to bottom,#bddcc9, #8ab79b)} diff --git a/core/public/css/error/error.error.css b/core/public/css/error/error.error.css index 5924c519a..abe777a48 100644 --- a/core/public/css/error/error.error.css +++ b/core/public/css/error/error.error.css @@ -1 +1 @@ -div.errorMessage{margin-bottom:10px;margin-top:5px;}div.exceptionText{margin-top:20px;} +div.errorMessage{margin-bottom:10px;margin-top:5px}div.exceptionText{margin-top:20px} diff --git a/core/public/css/feed/feed.index.css b/core/public/css/feed/feed.index.css index 7f77d11ed..de47985de 100644 --- a/core/public/css/feed/feed.index.css +++ b/core/public/css/feed/feed.index.css @@ -1 +1 @@ -div.feedThumbnail img{display:none;height:31px;margin-right:4px;width:31px;}div.feedThumbnail a{border:0;} +div.feedThumbnail img{display:none;height:31px;margin-right:4px;width:31px}div.feedThumbnail a{border:0} diff --git a/core/public/css/folder/folder.createfolder.css b/core/public/css/folder/folder.createfolder.css index 8326785db..7552691a0 100644 --- a/core/public/css/folder/folder.createfolder.css +++ b/core/public/css/folder/folder.createfolder.css @@ -1 +1 @@ -form#editFolderForm input[type="text"],form#editFolderForm input[type="password"]{width:350px !important;}form#editFolderForm textarea{width:350px !important;} +form#editFolderForm input[type='text'],form#editFolderForm input[type='password']{width:350px !important}form#editFolderForm textarea{width:350px !important} diff --git a/core/public/css/folder/folder.edit.css b/core/public/css/folder/folder.edit.css index 8326785db..7552691a0 100644 --- a/core/public/css/folder/folder.edit.css +++ b/core/public/css/folder/folder.edit.css @@ -1 +1 @@ -form#editFolderForm input[type="text"],form#editFolderForm input[type="password"]{width:350px !important;}form#editFolderForm textarea{width:350px !important;} +form#editFolderForm input[type='text'],form#editFolderForm input[type='password']{width:350px !important}form#editFolderForm textarea{width:350px !important} diff --git a/core/public/css/folder/folder.view.css b/core/public/css/folder/folder.view.css index d8339e65c..ed28101b4 100644 --- a/core/public/css/folder/folder.view.css +++ b/core/public/css/folder/folder.view.css @@ -1 +1 @@ -div.defaultSideTrigger{display:none;}div.viewInfo{display:inherit !important;}div.genericBigButton{position:relative;top:-20px;} +div.defaultSideTrigger{display:none}div.viewInfo{display:inherit !important}div.genericBigButton{position:relative;top:-20px} diff --git a/core/public/css/import/import.index.css b/core/public/css/import/import.index.css index 53d8c0d7a..c6ef7699e 100644 --- a/core/public/css/import/import.index.css +++ b/core/public/css/import/import.index.css @@ -1 +1 @@ -form.importForm dl{border:0;margin-top:25px;width:800px;}form.importForm dl dt{border-bottom:1px solid #eee;float:left;font-weight:bold;height:25px;margin-top:5px;padding-bottom:5px;text-align:right;width:200px;}form.importForm dl dd{border-bottom:1px solid #eee;display:inline;float:left;height:25px;margin-left:0;margin-top:5px;padding-bottom:5px;padding-left:20px;text-align:left;width:550px;}#submit-label,#submit-element{border-bottom:0;}.browse-button{left:630px;position:relative;top:-32px;}#progress{bottom:-20px;clear:both;height:10px;left:110px;position:relative;width:600px;}#progress_status{bottom:-30px;clear:both;left:110px;position:relative;text-align:center;width:600px;} +form.importForm dl{border:0;margin-top:25px;width:800px}form.importForm dl dt{border-bottom:1px solid #eee;float:left;font-weight:bold;height:25px;margin-top:5px;padding-bottom:5px;text-align:right;width:200px}form.importForm dl dd{border-bottom:1px solid #eee;display:inline;float:left;height:25px;margin-left:0;margin-top:5px;padding-bottom:5px;padding-left:20px;text-align:left;width:550px}#submit-label,#submit-element{border-bottom:0}.browse-button{left:630px;position:relative;top:-32px}#progress{bottom:-20px;clear:both;height:10px;left:110px;position:relative;width:600px}#progress_status{bottom:-30px;clear:both;left:110px;position:relative;text-align:center;width:600px} diff --git a/core/public/css/install/install.css b/core/public/css/install/install.css index 5fabe81be..b76c5d0af 100644 --- a/core/public/css/install/install.css +++ b/core/public/css/install/install.css @@ -1 +1 @@ -div.viewWrapper{padding-right:40px !important;} +div.viewWrapper{padding-right:40px !important} diff --git a/core/public/css/install/install.step2.css b/core/public/css/install/install.step2.css index 6dcdc4f96..96586b9a6 100644 --- a/core/public/css/install/install.step2.css +++ b/core/public/css/install/install.step2.css @@ -1 +1 @@ -.dbForm{display:none;}#dbResult{position:relative;}#dbResult div{height:30px;margin-left:203px;margin-top:4px;} +.dbForm{display:none}#dbResult{position:relative}#dbResult div{height:30px;margin-left:203px;margin-top:4px} diff --git a/core/public/css/item/item.edit.css b/core/public/css/item/item.edit.css index fb307a154..771c51fa5 100644 --- a/core/public/css/item/item.edit.css +++ b/core/public/css/item/item.edit.css @@ -1 +1 @@ -form#editItemForm input[type="text"],form#editItemForm input[type="password"]{width:350px !important;}form#editItemForm textarea{width:350px !important;}div.updateBitstreamNameNotice{background-color:#cdd;border-radius:4px;border:2px solid #acc;margin-bottom:5px;padding:8px;} +form#editItemForm input[type='text'],form#editItemForm input[type='password']{width:350px !important}form#editItemForm textarea{width:350px !important}div.updateBitstreamNameNotice{background-color:#cdd;border:2px solid #acc;border-radius:4px;margin-bottom:5px;padding:8px} diff --git a/core/public/css/item/item.editbitstream.css b/core/public/css/item/item.editbitstream.css index fff5e08ad..234087e82 100644 --- a/core/public/css/item/item.editbitstream.css +++ b/core/public/css/item/item.editbitstream.css @@ -1 +1 @@ -form#editBitstreamForm input[type="text"]{width:350px !important;}form#editBitstreamForm input[type="submit"]{margin:0 150px !important;} +form#editBitstreamForm input[type='text']{width:350px !important}form#editBitstreamForm input[type='submit']{margin:0 150px !important} diff --git a/core/public/css/item/item.editmetadata.css b/core/public/css/item/item.editmetadata.css index 8ecc3f65d..03b7507d0 100644 --- a/core/public/css/item/item.editmetadata.css +++ b/core/public/css/item/item.editmetadata.css @@ -1 +1 @@ -form#editItemForm input[type="text"],form#editItemForm input[type="password"]{width:350px !important;}form#editItemForm textarea{width:350px !important;} +form#editItemForm input[type='text'],form#editItemForm input[type='password']{width:350px !important}form#editItemForm textarea{width:350px !important} diff --git a/core/public/css/item/item.view.css b/core/public/css/item/item.view.css index 95fef974f..014429abc 100644 --- a/core/public/css/item/item.view.css +++ b/core/public/css/item/item.view.css @@ -1 +1 @@ -div.viewAction,div.viewInfo{display:block !important;}table.bitstreamList{display:table !important;}table#metadataTable{display:table !important;table-layout:fixed;}table#metadataTable th.elementHeader{width:6em;}table#metadataTable td{overflow:hidden;text-overflow:ellipsis;white-space:nowrap;}div.genericInfo{position:relative;}div.genericInfo .genericSubtitle{font-size:10px;}iframe#fullscreenVisualizeIframe{border:0;}div#fullscreenPanel{background-color:#fff;border-radius:6px;border:1px solid #d7d7d7;box-shadow:0 0 6px #ccc;float:right;padding:0 0 7px;width:380px;}div#fullscreenPanel h1{font-size:14px;}div#fullscreenPanel ul{list-style:none;margin:0;padding:0;}img.closeVisuButton{float:right;}span.manageMetadata{display:inline;float:right;}#revisionList h3 a{text-decoration:none;}#revisionList a img{float:left;margin-right:2px;}#parentList a img{position:relative;top:3px;}div.itemViewMainSection{border-top:1px solid #d7d7d7;margin-bottom:14px;}div.itemViewMainSection h4{color:#999;font-size:11px;margin-bottom:0.67em;margin-top:0.67em;text-shadow:#fff 0 1px 1px;text-transform:uppercase;}table.bitstreamList,table.metadataList{border-collapse:collapse;border-spacing:0;width:100%;}table.bitstreamList th,table.metadataList th{background-color:#d0d0f6;border:1px solid #808080;}table.bitstreamList td,table.metadataList td{border:1px solid #b5b5b5;}div.revisionEntry{border-top:1px solid #a7a7a7 !important;padding-left:13px !important;padding-right:13px !important;}img.editBitstreamIcon{cursor:pointer;float:none;}img.deleteBitstreamIcon,img.bitstreamInfoIcon{cursor:pointer;float:right;}button.topDownloadButton{background-color:#49c;background-image:-webkit-linear-gradient(top, #49c, #46a);background-image:linear-gradient(to bottom,#49c, #46a);border-radius:6px;border:#354856 1px solid;color:#fff;cursor:pointer;font-size:14px;font-weight:bold;height:35px;width:100px;}button.topDownloadButton:hover{background-color:#277;background-image:-webkit-linear-gradient(top, #277, #244);background-image:linear-gradient(to bottom,#277, #244);} +div.viewAction,div.viewInfo{display:block !important}table.bitstreamList{display:table !important}table#metadataTable{display:table !important;table-layout:fixed}table#metadataTable th.elementHeader{width:6em}table#metadataTable td{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}div.genericInfo{position:relative}div.genericInfo .genericSubtitle{font-size:10px}iframe#fullscreenVisualizeIframe{border:0}div#fullscreenPanel{background-color:#fff;border:1px solid #d7d7d7;border-radius:6px;box-shadow:0 0 6px #ccc;float:right;padding:0 0 7px;width:380px}div#fullscreenPanel h1{font-size:14px}div#fullscreenPanel ul{list-style:none;margin:0;padding:0}img.closeVisuButton{float:right}span.manageMetadata{display:inline;float:right}#revisionList h3 a{text-decoration:none}#revisionList a img{float:left;margin-right:2px}#parentList a img{position:relative;top:3px}div.itemViewMainSection{border-top:1px solid #d7d7d7;margin-bottom:14px}div.itemViewMainSection h4{color:#999;font-size:11px;margin-bottom:0.67em;margin-top:0.67em;text-shadow:#fff 0 1px 1px;text-transform:uppercase}table.bitstreamList,table.metadataList{border-collapse:collapse;border-spacing:0;width:100%}table.bitstreamList th,table.metadataList th{background-color:#d0d0f6;border:1px solid #808080}table.bitstreamList td,table.metadataList td{border:1px solid #b5b5b5}div.revisionEntry{border-top:1px solid #a7a7a7 !important;padding-left:13px !important;padding-right:13px !important}img.editBitstreamIcon{cursor:pointer;float:none}img.deleteBitstreamIcon,img.bitstreamInfoIcon{cursor:pointer;float:right}button.topDownloadButton{background-color:#49c;background-image:-webkit-linear-gradient(top, #49c, #46a);background-image:linear-gradient(to bottom,#49c, #46a);border:#354856 1px solid;border-radius:6px;color:#fff;cursor:pointer;font-size:14px;font-weight:bold;height:35px;width:100px}button.topDownloadButton:hover{background-color:#277;background-image:-webkit-linear-gradient(top, #277, #244);background-image:linear-gradient(to bottom,#277, #244)} diff --git a/core/public/css/layout/form.css b/core/public/css/layout/form.css index e087719f6..2149b91fd 100644 --- a/core/public/css/layout/form.css +++ b/core/public/css/layout/form.css @@ -1 +1 @@ -form.genericForm dt label{display:block;float:left;margin-right:5px;text-align:right;width:200px;}form.genericForm input[type=submit],form.genericForm input[type=button]{background:#f6f9fe url(images/ui-bg_glass_85_f6f9fe_1x400.png) repeat-x 50% 50%;border:1px solid #808080;-moz-box-align:center;-webkit-box-align:center;box-sizing:border-box;color:#2e6e9e;cursor:pointer;display:inline-block;font-weight:bold;line-height:1.4;margin-left:116px;margin-right:0.1em;overflow:visible;position:relative;text-align:center;text-decoration:none !important;zoom:1;}form.genericForm input[type=submit]:hover,form.genericForm input[type=button]:hover{background:#cbd9e3 none;color:#1d5987;text-decoration:none;}form.genericForm input[type=submit][disabled],form.genericForm input[type=button][disabled]{background:#dbdbdb none;color:#808080;cursor:default;text-decoration:none;}.globalButton[disabled]{background:#dbdbdb none;color:#808080;cursor:default;text-decoration:none;}form.genericForm input[type=submit][disabled]:hover,form.genericForm input[type=button][disabled]:hover{background-image:none;background:#dbdbdb !important;color:#808080 !important;cursor:default;text-decoration:none;}.globalButton[disabled]:hover{background-image:none;background:#dbdbdb !important;color:#808080 !important;cursor:default;text-decoration:none;}form.genericForm div label{display:block;float:left;margin-right:5px;text-align:left;width:200px;}form.genericForm input[type=text],form.genericForm input[type=password]{background:#f3f1ec;border:1px solid #808080;color:#000;height:18px;margin-right:10px;}form.genericForm textarea{background:#f3f1ec;border:1px solid #808080;color:#000;height:18px;margin-right:10px;}form.genericForm input[type=text],form.genericForm input[type=password]{width:250px;}form.genericForm textarea{width:247px;height:35px;}form.genericForm input[type=text]:hover,form.genericForm input[type=password]:hover{background:#fff;}form.genericForm textarea:hover{background:#fff;}form.genericForm div input[type=submit]{background:#f6f9fe url(images/ui-bg_glass_85_f6f9fe_1x400.png) repeat-x 50% 50%;border:1px solid #808080;-moz-box-align:center;-webkit-box-align:center;box-sizing:border-box;color:#2e6e9e;cursor:pointer;display:inline-block;font-family:"Lucida Grande", Tahoma, Verdana, Arial, sans-serif;font-weight:bold;line-height:1.4;margin-left:208px;margin-right:0.1em;overflow:visible;position:relative;text-align:center;text-decoration:none !important;zoom:1;}input.globalButton{background:#f6f9fe url(images/ui-bg_glass_85_f6f9fe_1x400.png) repeat-x 50% 50%;border:1px solid #808080;-moz-box-align:center;-webkit-box-align:center;box-sizing:border-box;color:#2e6e9e;cursor:pointer;display:inline-block;font-family:"Lucida Grande", Tahoma, Verdana, Arial, sans-serif;font-weight:bold;line-height:1.4;margin-left:208px;margin-right:0.1em;overflow:visible;position:relative;text-align:center;text-decoration:none !important;zoom:1;}form.genericForm input[type=button]{background:#f6f9fe url(images/ui-bg_glass_85_f6f9fe_1x400.png) repeat-x 50% 50%;border:1px solid #808080;-moz-box-align:center;-webkit-box-align:center;box-sizing:border-box;color:#2e6e9e;cursor:pointer;display:inline-block;font-family:"Lucida Grande", Tahoma, Verdana, Arial, sans-serif;font-weight:bold;line-height:1.4;margin-left:208px;margin-right:0.1em;overflow:visible;position:relative;text-align:center;text-decoration:none !important;zoom:1;}form.genericForm input[type=submit]:hover{background:#cbd9e3 none;color:#1d5987;text-decoration:none;}input.globalButton:hover{background:#cbd9e3 none;color:#1d5987;text-decoration:none;} +form.genericForm dt label{display:block;float:left;margin-right:5px;text-align:right;width:200px}form.genericForm input[type=submit],form.genericForm input[type=button]{background:#f6f9fe url('images/ui-bg_glass_85_f6f9fe_1x400.png') repeat-x 50% 50%;border:1px solid #808080;-moz-box-align:center;-webkit-box-align:center;box-sizing:border-box;color:#2e6e9e;cursor:pointer;display:inline-block;font-weight:bold;line-height:1.4;margin-left:116px;margin-right:0.1em;overflow:visible;position:relative;text-align:center;text-decoration:none !important;zoom:1}form.genericForm input[type=submit]:hover,form.genericForm input[type=button]:hover{background:#cbd9e3 none;color:#1d5987;text-decoration:none}form.genericForm input[type=submit][disabled],form.genericForm input[type=button][disabled]{background:#dbdbdb none;color:#808080;cursor:default;text-decoration:none}.globalButton[disabled]{background:#dbdbdb none;color:#808080;cursor:default;text-decoration:none}form.genericForm input[type=submit][disabled]:hover,form.genericForm input[type=button][disabled]:hover{background:#dbdbdb !important;background-image:none;color:#808080 !important;cursor:default;text-decoration:none}.globalButton[disabled]:hover{background:#dbdbdb !important;background-image:none;color:#808080 !important;cursor:default;text-decoration:none}form.genericForm div label{display:block;float:left;margin-right:5px;text-align:left;width:200px}form.genericForm input[type=text],form.genericForm input[type=password]{background:#f3f1ec;border:1px solid #808080;color:#000;height:18px;margin-right:10px}form.genericForm textarea{background:#f3f1ec;border:1px solid #808080;color:#000;height:18px;margin-right:10px}form.genericForm input[type=text],form.genericForm input[type=password]{width:250px}form.genericForm textarea{height:35px;width:247px}form.genericForm input[type=text]:hover,form.genericForm input[type=password]:hover{background:#fff}form.genericForm textarea:hover{background:#fff}form.genericForm div input[type=submit]{background:#f6f9fe url('images/ui-bg_glass_85_f6f9fe_1x400.png') repeat-x 50% 50%;border:1px solid #808080;-moz-box-align:center;-webkit-box-align:center;box-sizing:border-box;color:#2e6e9e;cursor:pointer;display:inline-block;font-family:"Lucida Grande", Tahoma, Verdana, Arial, sans-serif;font-weight:bold;line-height:1.4;margin-left:208px;margin-right:0.1em;overflow:visible;position:relative;text-align:center;text-decoration:none !important;zoom:1}input.globalButton{background:#f6f9fe url('images/ui-bg_glass_85_f6f9fe_1x400.png') repeat-x 50% 50%;border:1px solid #808080;-moz-box-align:center;-webkit-box-align:center;box-sizing:border-box;color:#2e6e9e;cursor:pointer;display:inline-block;font-family:"Lucida Grande", Tahoma, Verdana, Arial, sans-serif;font-weight:bold;line-height:1.4;margin-left:208px;margin-right:0.1em;overflow:visible;position:relative;text-align:center;text-decoration:none !important;zoom:1}form.genericForm input[type=button]{background:#f6f9fe url('images/ui-bg_glass_85_f6f9fe_1x400.png') repeat-x 50% 50%;border:1px solid #808080;-moz-box-align:center;-webkit-box-align:center;box-sizing:border-box;color:#2e6e9e;cursor:pointer;display:inline-block;font-family:"Lucida Grande", Tahoma, Verdana, Arial, sans-serif;font-weight:bold;line-height:1.4;margin-left:208px;margin-right:0.1em;overflow:visible;position:relative;text-align:center;text-decoration:none !important;zoom:1}form.genericForm input[type=submit]:hover{background:#cbd9e3 none;color:#1d5987;text-decoration:none}input.globalButton:hover{background:#cbd9e3 none;color:#1d5987;text-decoration:none} diff --git a/core/public/css/layout/jquery.treeTable.css b/core/public/css/layout/jquery.treeTable.css index ef571ddd3..dde530f91 100644 --- a/core/public/css/layout/jquery.treeTable.css +++ b/core/public/css/layout/jquery.treeTable.css @@ -1 +1 @@ -.treeTable tr td .expander{background-position:left center;background-repeat:no-repeat;cursor:pointer;padding:0;zoom:1;}.treeTable tr.collapsed td .expander{background-image:url(../../images/TreeTable/toggle-expand-dark.png);}.treeTable tr.expanded td .expander{background-image:url(../../images/TreeTable/toggle-collapse-dark.png);}.treeTable span.elementSize{padding:0px !important;}.treeTable tr.selected,.treeTable tr.accept{background-color:#c0d1fe !important;border:1px solid #808080;}.treeTable tr.collapsed.selected td .expander,.treeTable tr.collapsed.accept td .expander{background-image:url(../../images/TreeTable/toggle-expand-dark.png);}.treeTable tr.expanded.selected td .expander,.treeTable tr.expanded.accept td .expander{background-image:url(../../images/TreeTable/toggle-collapse-dark.png);}.treeTable .ui-draggable-dragging{color:#000;z-index:1;}table.midasTree{width:580px;display:none;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;border-collapse:collapse;}table.midasTree thead th{font-family:"Lucida Grande", Tahoma, Verdana, Arial, sans-serif;font-size:8pt;color:#000;background-color:#e6eeee;border:1px solid #aaa;padding:3px;background-repeat:no-repeat;background-position:center right;}table.midasTree thead th.thData{padding-left:10px;cursor:pointer;background-image:url(images/asc.gif);}table.midasTree thead th.thDate{width:15%;padding-left:10px;cursor:pointer;background-image:url(images/bg.gif);}table.midasTree thead th.thSize{width:14%;padding-left:10px;cursor:pointer;background-image:url(images/bg.gif);}table.midasTree th.sortasc{background-image:url(images/asc.gif) !important;}table.midasTree th.sortdesc{background-image:url(images/desc.gif) !important;}table.midasTree th.sortnone{background-image:url(images/bg.gif) !important;}table.midasTree th.thSize:hover,table.midasTree th.thData:hover,table.midasTree th.thDate:hover{background-color:#cdd;}table.midasTree th.thCheckbox{width:20px;}#browseTableHeaderCheckbox{margin-top:2px;margin-bottom:2px;margin-left:3px;margin-right:3px;}table.midasTree tbody tr td{-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;cursor:default;padding-left:3px;}table.midasTree tr{border-bottom:1px #ccd7e0 dotted;}table.midasTree tr:hover{background-color:#f3f1ec;}table.midasTree tbody tr td.treeBrowseElement{padding-left:1.5em !important;cursor:pointer;}table.midasTree tbody tr.even{background:#f3f3f3;}table.midasTree tbody tr.odd{background:#fff;}table.midasTree span{background-position:center left;background-repeat:no-repeat;padding:0.2em 0 0.2em 1.5em;}table.midasTree span.file{background-image:url(../../images/TreeTable/page_white_text.png);}table.midasTree span.filePrivate{background-image:url(../../images/TreeTable/page_white_text_private.png);}table.midasTree span.filePublic{background-image:url(../../images/TreeTable/page_white_text_world.png);}table.midasTree span.folder{background-image:url(../../images/TreeTable/folder.png);}table.midasTree span.folderPrivate{background-image:url(../../images/TreeTable/folder_private.png);}table.midasTree span.folderPublic{background-image:url(../../images/TreeTable/folder_world.png);}table.midasTree span.loading{background-image:url(../../images/icons/loading.gif);}table.midasTree span.community{background-image:url(../../images/icons/community.png);}img.tableLoading{float:right;} +.treeTable tr td .expander{background-position:left center;background-repeat:no-repeat;cursor:pointer;padding:0;zoom:1}.treeTable tr.collapsed td .expander{background-image:url('../../images/TreeTable/toggle-expand-dark.png')}.treeTable tr.expanded td .expander{background-image:url('../../images/TreeTable/toggle-collapse-dark.png')}.treeTable span.elementSize{padding:0 !important}.treeTable tr.selected,.treeTable tr.accept{background-color:#c0d1fe !important;border:1px solid #808080}.treeTable tr.collapsed.selected td .expander,.treeTable tr.collapsed.accept td .expander{background-image:url('../../images/TreeTable/toggle-expand-dark.png')}.treeTable tr.expanded.selected td .expander,.treeTable tr.expanded.accept td .expander{background-image:url('../../images/TreeTable/toggle-collapse-dark.png')}.treeTable .ui-draggable-dragging{color:#000;z-index:1}table.midasTree{-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;border-collapse:collapse;display:none;width:580px}table.midasTree thead th{background-color:#e6eeee;background-position:center right;background-repeat:no-repeat;border:1px solid #aaa;color:#000;font-family:"Lucida Grande", Tahoma, Verdana, Arial, sans-serif;font-size:8pt;padding:3px}table.midasTree thead th.thData{background-image:url('images/asc.gif');cursor:pointer;padding-left:10px}table.midasTree thead th.thDate{background-image:url('images/bg.gif');cursor:pointer;padding-left:10px;width:15%}table.midasTree thead th.thSize{background-image:url('images/bg.gif');cursor:pointer;padding-left:10px;width:14%}table.midasTree th.sortasc{background-image:url('images/asc.gif') !important}table.midasTree th.sortdesc{background-image:url('images/desc.gif') !important}table.midasTree th.sortnone{background-image:url('images/bg.gif') !important}table.midasTree th.thSize:hover,table.midasTree th.thData:hover,table.midasTree th.thDate:hover{background-color:#cdd}table.midasTree th.thCheckbox{width:20px}#browseTableHeaderCheckbox{margin-bottom:2px;margin-left:3px;margin-right:3px;margin-top:2px}table.midasTree tbody tr td{-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;cursor:default;padding-left:3px}table.midasTree tr{border-bottom:1px #ccd7e0 dotted}table.midasTree tr:hover{background-color:#f3f1ec}table.midasTree tbody tr td.treeBrowseElement{cursor:pointer;padding-left:1.5em !important}table.midasTree tbody tr.even{background:#f3f3f3}table.midasTree tbody tr.odd{background:#fff}table.midasTree span{background-position:center left;background-repeat:no-repeat;padding:0.2em 0 0.2em 1.5em}table.midasTree span.file{background-image:url('../../images/TreeTable/page_white_text.png')}table.midasTree span.filePrivate{background-image:url('../../images/TreeTable/page_white_text_private.png')}table.midasTree span.filePublic{background-image:url('../../images/TreeTable/page_white_text_world.png')}table.midasTree span.folder{background-image:url('../../images/TreeTable/folder.png')}table.midasTree span.folderPrivate{background-image:url('../../images/TreeTable/folder_private.png')}table.midasTree span.folderPublic{background-image:url('../../images/TreeTable/folder_world.png')}table.midasTree span.loading{background-image:url('../../images/icons/loading.gif')}table.midasTree span.community{background-image:url('../../images/icons/community.png')}img.tableLoading{float:right} diff --git a/core/public/css/layout/loginForm.css b/core/public/css/layout/loginForm.css index 63ef9e004..eb681ef9f 100644 --- a/core/public/css/layout/loginForm.css +++ b/core/public/css/layout/loginForm.css @@ -1 +1 @@ -form#loginForm{color:#fff;margin-left:auto;margin-right:auto;position:relative;top:13px;width:600px;}form#loginForm div{display:inline;}form#loginForm div.loginError{color:#57bb7d;position:absolute;top:-15px;}form#loginForm div.loginError span,form#loginForm div.loginError img{display:none;position:relative;}form#loginForm div.rememberMe{float:right;left:-453px;position:relative;top:20px;}form#loginForm div.links{float:right;left:-100px;position:relative;top:1px;}form#loginForm a{color:#fff;text-decoration:none;}form#loginForm div.links a:hover{color:#808080;}form#loginForm input[type=text],form#loginForm input[type=password]{background:#f3f1ec !important;border:1px solid #808080;color:#000;height:18px;margin-right:10px;width:150px;}form#loginForm input[type=text],form#loginForm input[type=password]{width:200px;}form#loginForm input[type=text]:hover,form#loginForm input[type=password]:hover{background:#fff !important;}form#loginForm input[type=submit]{left:0;margin-left:0;position:relative;top:0;}form#loginForm table{border-spacing:0;}form#loginForm #rememberMeText{cursor:pointer;} +form#loginForm{color:#fff;margin-left:auto;margin-right:auto;position:relative;top:13px;width:600px}form#loginForm div{display:inline}form#loginForm div.loginError{color:#57bb7d;position:absolute;top:-15px}form#loginForm div.loginError span,form#loginForm div.loginError img{display:none;position:relative}form#loginForm div.rememberMe{float:right;left:-453px;position:relative;top:20px}form#loginForm div.links{float:right;left:-100px;position:relative;top:1px}form#loginForm a{color:#fff;text-decoration:none}form#loginForm div.links a:hover{color:#808080}form#loginForm input[type=text],form#loginForm input[type=password]{background:#f3f1ec !important;border:1px solid #808080;color:#000;height:18px;margin-right:10px;width:150px}form#loginForm input[type=text],form#loginForm input[type=password]{width:200px}form#loginForm input[type=text]:hover,form#loginForm input[type=password]:hover{background:#fff !important}form#loginForm input[type=submit]{left:0;margin-left:0;position:relative;top:0}form#loginForm table{border-spacing:0}form#loginForm #rememberMeText{cursor:pointer} diff --git a/core/public/css/layout/midas.empty.css b/core/public/css/layout/midas.empty.css index 14fcfc694..81f97d2a7 100644 --- a/core/public/css/layout/midas.empty.css +++ b/core/public/css/layout/midas.empty.css @@ -1 +1 @@ -article,aside,details,figcaption,figure,footer,header,hgroup,nav,section,summary{display:block;}audio,canvas,video{display:inline-block;}audio:not([controls]){display:none;height:0;}[hidden],template{display:none;}html{background:#fff;color:#000;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;}html,button,input,select,textarea{font-family:sans-serif;}body{margin:0;}a{background:transparent;}a:focus{outline:thin dotted;}a:hover,a:active{outline:0;}h1{font-size:2em;margin:0.67em 0;}h2{font-size:1.5em;margin:0.83em 0;}h3{font-size:1.17em;margin:1em 0;}h4{font-size:1em;margin:1.33em 0;}h5{font-size:0.83em;margin:1.67em 0;}h6{font-size:0.75em;margin:2.33em 0;}abbr[title]{border-bottom:1px dotted;}b,strong{font-weight:bold;}dfn{font-style:italic;}mark{background:#ff0;color:#000;}code,kbd,pre,samp{font-family:monospace, serif;font-size:1em;}pre{white-space:pre;white-space:pre-wrap;word-wrap:break-word;}q{quotes:"\201C" "\201D" "\2018" "\2019";}q:before,q:after{content:'';content:none;}small{font-size:80%;}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline;}sup{top:-0.5em;}sub{bottom:-0.25em;}img{border:0;}svg:not(:root){overflow:hidden;}figure{margin:0;}fieldset{border:1px solid #c0c0c0;margin:0 2px;padding:0.35em 0.625em 0.75em;}legend{border:0;padding:0;white-space:normal;}button,input,select,textarea{font-family:inherit;font-size:100%;margin:0;vertical-align:baseline;}button,input{line-height:normal;}button,select{text-transform:none;}button,html input[type="button"],input[type="reset"],input[type="submit"]{-webkit-appearance:button;cursor:pointer;}button[disabled],input[disabled]{cursor:default;}input[type="checkbox"],input[type="radio"]{box-sizing:border-box;padding:0;}input[type="search"]{-webkit-appearance:textfield;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box;}input[type="search"]::-webkit-search-cancel-button,input[type="search"]::-webkit-search-decoration{-webkit-appearance:none;}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0;}textarea{overflow:auto;vertical-align:top;}table{border-collapse:collapse;border-spacing:0;}body{border:0;font-family:"Lucida Grande", Tahoma, Verdana, Arial, sans-serif;font-size:12px;height:100%;margin:0;padding:0;text-align:left;width:100%;}img{border:0;}a{cursor:pointer;}a:visited{border:none;text-decoration:none;}a:active{outline:none;}a:focus,li:active,li:focus{outline:none;}img.thumbnailSmall{height:32px;margin-right:3px;width:32px;}.ui-widget{font-family:"Lucida Grande", Tahoma, Verdana, Arial, sans-serif !important;font-size:12px !important;}div#guideRobot{display:none;}div.genericBigButton{background-color:#fff;background-image:-webkit-linear-gradient(top, #fff, #c4c4c4);background-image:linear-gradient(to bottom,#fff, #c4c4c4);border-radius:3px;border:#354856 1px solid;box-shadow:0 0 2px #666;color:#000;cursor:pointer;display:block;float:left;font-size:12px;font-weight:normal;list-style-type:none;padding:1px 3px 2px 3px;}div.genericBigButton a{color:#000 !important;font-size:12px !important;font-weight:normal !important;}div.genericBigButton a:hover{text-decoration:none !important;}div.genericBigButton:hover{background-color:#bddcc9;background-image:-webkit-linear-gradient(top, #bddcc9, #8ab79b);background-image:linear-gradient(to bottom,#bddcc9, #8ab79b);}div.genericWrapperTopRight{float:right;}div.viewAction li a:hover,div.genericAction li a:hover,div.viewSelected li a:hover{text-decoration:none;}div.viewAction li img,div.genericAction li img,div.viewSelected li img{position:relative;top:3px;}div.viewAction hr,div.genericAction hr{background-color:#d7d7d7;border:0;color:#d7d7d7;height:1px;margin-bottom:0;margin-left:0;margin-top:3px;width:130px;}div.viewSideBar h1{color:#999;font-size:11px;margin-bottom:0.67em;margin-top:0.67em;text-shadow:#fff 0 1px 1px;text-transform:uppercase;}.jgrowl{font-size:13px !important;font-weight:bold !important;min-width:300px !important;padding-bottom:2px !important;padding-top:2px !important;z-index:15102 !important;}.uploadqtip{background-color:#fff !important;border:1px solid #808080 !important;min-width:600px !important;}.qtip-titlebar{background-color:#d7d7d7 !important;}.growlError{background:url(../../images/icons/nok.png) no-repeat;padding-left:18px;}.growlWarning{background:url(../../images/icons/warning.png) no-repeat;padding-left:18px;}.growlOk{background:url(../../images/icons/ok.png) no-repeat;padding-left:18px;}.recentItem{overflow:hidden;text-overflow:ellipsis;white-space:nowrap;}div.viewWrapper a{color:#56758b;cursor:pointer;font-weight:500;text-decoration:none;}div.viewWrapper a:hover{text-decoration:underline;}div.errorText{color:#f00;}span.errorText{color:#f00;} +article,aside,details,figcaption,figure,footer,header,hgroup,nav,section,summary{display:block}audio,canvas,video{display:inline-block}audio:not([controls]){display:none;height:0}[hidden],template{display:none}html{background:#fff;color:#000;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%}html,button,input,select,textarea{font-family:sans-serif}body{margin:0}a{background:transparent}a:focus{outline:thin dotted}a:hover,a:active{outline:0}h1{font-size:2em;margin:0.67em 0}h2{font-size:1.5em;margin:0.83em 0}h3{font-size:1.17em;margin:1em 0}h4{font-size:1em;margin:1.33em 0}h5{font-size:0.83em;margin:1.67em 0}h6{font-size:0.75em;margin:2.33em 0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:bold}dfn{font-style:italic}mark{background:#ff0;color:#000}code,kbd,pre,samp{font-family:monospace, serif;font-size:1em}pre{white-space:pre;white-space:pre-wrap;word-wrap:break-word}q{quotes:"\201C" "\201D" "\2018" "\2019"}q:before,q:after{content:'';content:none}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sup{top:-0.5em}sub{bottom:-0.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:0}fieldset{border:1px solid #c0c0c0;margin:0 2px;padding:0.35em 0.625em 0.75em}legend{border:0;padding:0;white-space:normal}button,input,select,textarea{font-family:inherit;font-size:100%;margin:0;vertical-align:baseline}button,input{line-height:normal}button,select{text-transform:none}button,html input[type="button"],input[type="reset"],input[type="submit"]{-webkit-appearance:button;cursor:pointer}button[disabled],input[disabled]{cursor:default}input[type="checkbox"],input[type="radio"]{box-sizing:border-box;padding:0}input[type="search"]{-webkit-appearance:textfield;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box}input[type="search"]::-webkit-search-cancel-button,input[type="search"]::-webkit-search-decoration{-webkit-appearance:none}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}textarea{overflow:auto;vertical-align:top}table{border-collapse:collapse;border-spacing:0}body{border:0;font-family:"Lucida Grande", Tahoma, Verdana, Arial, sans-serif;font-size:12px;height:100%;margin:0;padding:0;text-align:left;width:100%}img{border:0}a{cursor:pointer}a:visited{border:0;text-decoration:none}a:active{outline:none}a:focus,li:active,li:focus{outline:none}img.thumbnailSmall{height:32px;margin-right:3px;width:32px}.ui-widget{font-family:"Lucida Grande", Tahoma, Verdana, Arial, sans-serif !important;font-size:12px !important}div#guideRobot{display:none}div.genericBigButton{background-color:#fff;background-image:-webkit-linear-gradient(top, #fff, #c4c4c4);background-image:linear-gradient(to bottom,#fff, #c4c4c4);border:#354856 1px solid;border-radius:3px;box-shadow:0 0 2px #666;color:#000;cursor:pointer;display:block;float:left;font-size:12px;font-weight:normal;list-style-type:none;padding:1px 3px 2px}div.genericBigButton a{color:#000 !important;font-size:12px !important;font-weight:normal !important}div.genericBigButton a:hover{text-decoration:none !important}div.genericBigButton:hover{background-color:#bddcc9;background-image:-webkit-linear-gradient(top, #bddcc9, #8ab79b);background-image:linear-gradient(to bottom,#bddcc9, #8ab79b)}div.genericWrapperTopRight{float:right}div.viewAction li a:hover,div.genericAction li a:hover,div.viewSelected li a:hover{text-decoration:none}div.viewAction li img,div.genericAction li img,div.viewSelected li img{position:relative;top:3px}div.viewAction hr,div.genericAction hr{background-color:#d7d7d7;border:0;color:#d7d7d7;height:1px;margin-bottom:0;margin-left:0;margin-top:3px;width:130px}div.viewSideBar h1{color:#999;font-size:11px;margin-bottom:0.67em;margin-top:0.67em;text-shadow:#fff 0 1px 1px;text-transform:uppercase}.jgrowl{font-size:13px !important;font-weight:bold !important;min-width:300px !important;padding-bottom:2px !important;padding-top:2px !important;z-index:15102 !important}.uploadqtip{background-color:#fff !important;border:1px solid #808080 !important;min-width:600px !important}.qtip-titlebar{background-color:#d7d7d7 !important}.growlError{background:url('../../images/icons/nok.png') no-repeat;padding-left:18px}.growlWarning{background:url('../../images/icons/warning.png') no-repeat;padding-left:18px}.growlOk{background:url('../../images/icons/ok.png') no-repeat;padding-left:18px}.recentItem{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}div.viewWrapper a{color:#56758b;cursor:pointer;font-weight:500;text-decoration:none}div.viewWrapper a:hover{text-decoration:underline}div.errorText{color:#f00}span.errorText{color:#f00} diff --git a/core/public/css/layout/midas.layout.css b/core/public/css/layout/midas.layout.css index 17f15d6d8..a9a554875 100644 --- a/core/public/css/layout/midas.layout.css +++ b/core/public/css/layout/midas.layout.css @@ -1 +1 @@ -article,aside,details,figcaption,figure,footer,header,hgroup,nav,section,summary{display:block;}audio,canvas,video{display:inline-block;}audio:not([controls]){display:none;height:0;}[hidden],template{display:none;}html{background:#fff;color:#000;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;}html,button,input,select,textarea{font-family:sans-serif;}body{margin:0;}a{background:transparent;}a:focus{outline:thin dotted;}a:hover,a:active{outline:0;}h1{font-size:2em;margin:0.67em 0;}h2{font-size:1.5em;margin:0.83em 0;}h3{font-size:1.17em;margin:1em 0;}h4{font-size:1em;margin:1.33em 0;}h5{font-size:0.83em;margin:1.67em 0;}h6{font-size:0.75em;margin:2.33em 0;}abbr[title]{border-bottom:1px dotted;}b,strong{font-weight:bold;}dfn{font-style:italic;}mark{background:#ff0;color:#000;}code,kbd,pre,samp{font-family:monospace, serif;font-size:1em;}pre{white-space:pre;white-space:pre-wrap;word-wrap:break-word;}q{quotes:"\201C" "\201D" "\2018" "\2019";}q:before,q:after{content:'';content:none;}small{font-size:80%;}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline;}sup{top:-0.5em;}sub{bottom:-0.25em;}img{border:0;}svg:not(:root){overflow:hidden;}figure{margin:0;}fieldset{border:1px solid #c0c0c0;margin:0 2px;padding:0.35em 0.625em 0.75em;}legend{border:0;padding:0;white-space:normal;}button,input,select,textarea{font-family:inherit;font-size:100%;margin:0;vertical-align:baseline;}button,input{line-height:normal;}button,select{text-transform:none;}button,html input[type="button"],input[type="reset"],input[type="submit"]{-webkit-appearance:button;cursor:pointer;}button[disabled],input[disabled]{cursor:default;}input[type="checkbox"],input[type="radio"]{box-sizing:border-box;padding:0;}input[type="search"]{-webkit-appearance:textfield;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box;}input[type="search"]::-webkit-search-cancel-button,input[type="search"]::-webkit-search-decoration{-webkit-appearance:none;}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0;}textarea{overflow:auto;vertical-align:top;}table{border-collapse:collapse;border-spacing:0;}html{background-color:#f3f1ec;}body{background-color:#f3f1ec;border:0;font-family:"Lucida Grande", Tahoma, Verdana, Arial, sans-serif;font-size:12px;height:100%;margin:0;min-width:800px;padding:0;text-align:left;width:100%;}.clear{clear:both;content:'.';display:block;height:0;visibility:hidden;}dl{margin:0;padding:0;}img{border:0;}a{cursor:pointer;}a:visited{border:none;text-decoration:none;}a:active{outline:none;}a:focus,li:active,li:focus{outline:none;}img.thumbnailSmall{height:32px;margin-right:3px;width:32px;}.ui-widget{font-family:"Lucida Grande", Tahoma, Verdana, Arial, sans-serif !important;font-size:12px !important;}div#guideRobot{display:none;}div.genericBigButton{background-color:#fff;background-image:-webkit-linear-gradient(top, #fff, #c4c4c4);background-image:linear-gradient(to bottom,#fff, #c4c4c4);border-radius:3px;border:#354856 1px solid;box-shadow:0 0 2px #666;color:#000;cursor:pointer;display:block;float:left;font-size:12px;font-weight:normal;list-style-type:none;padding:1px 3px 2px 3px;}div.genericBigButton a{color:#000 !important;font-size:12px !important;font-weight:normal !important;}div.genericBigButton a:hover{text-decoration:none !important;}div.genericBigButton:hover{background-color:#bddcc9;background-image:-webkit-linear-gradient(top, #bddcc9, #8ab79b);background-image:linear-gradient(to bottom,#bddcc9, #8ab79b);}div.genericWrapperTopRight{float:right;}div.viewAction li a{display:inline-block;padding-bottom:2px;}div.viewAction li a:hover{text-decoration:none;}div.genericAction li a:hover,div.viewSelected li a:hover{text-decoration:none;}div.viewAction li img,div.genericAction li img,div.viewSelected li img{position:relative;top:2px;}div.genericAction li:hover{background-color:#e5e5e5;color:#000;}div.genericAction li a{display:inline-block;padding-bottom:2px;}div.viewAction hr,div.genericAction hr{background-color:#d7d7d7;border:0;color:#d7d7d7;height:1px;margin-bottom:0;margin-left:0;margin-top:3px;width:130px;}.jgrowl{font-size:13px !important;font-weight:bold !important;min-width:300px !important;padding-bottom:2px !important;padding-top:2px !important;z-index:15102 !important;}.uploadqtip{background-color:#fff !important;border:1px solid #808080 !important;min-width:600px !important;}.qtip-titlebar{background-color:#d7d7d7 !important;}div.TopDynamicBar{background-color:#4b4b4b;display:none;min-height:50px;}div.TopDynamicClose{margin-right:10px;margin-top:0;}div.TopDynamicClose a{color:#fff;font-size:12px;text-decoration:none;}div.TopDynamicBar .closeButton{float:right;}div.TopDynamicBar .closeButton span{left:-3px;position:relative;top:-4px;}div.Topbar{background-color:#414141;background-image:-webkit-linear-gradient(bottom, #414141, #4b4b4b);background-image:linear-gradient(to top,#414141, #4b4b4b);border-bottom:2px #354856 solid;font-family:"Lucida Grande", Tahoma, Verdana, Arial, sans-serif;font-size:12px;height:20px;text-align:left;z-index:99;}div.Topbar div.TopbarContent{color:#fff;padding-top:4px;}div.Topbar div.TopbarLeft{float:left;}div.Topbar div.TopbarRight{float:right;}div.Topbar ul{display:block;list-style-type:disc;margin:0 25px 0 15px;padding:0;position:relative;}div.Topbar ul li{border-left:1px #808080 solid;display:block;float:left;list-style-type:none;margin-left:10px;padding-left:10px;position:relative;}div.Topbar ul li.first{border:none;display:block;float:left;list-style-type:none;margin-left:5px;padding-left:5px;}div.Topbar li a{color:#ddd;display:block;text-decoration:none;}div.Topbar li a:hover{background-color:#1d1d1d;text-decoration:none;}div.Header{background-color:#56758b;background-image:-webkit-linear-gradient(bottom, #56758b, #63869f);background-image:linear-gradient(to top,#56758b, #63869f);box-shadow:0 0 3px #666;margin:0 0 15px;padding:5px 30px;}div.Header div.HeaderContent{height:45px;margin:0 auto;max-width:1200px;min-width:800px;padding:0 0 0;}div.Header div.HeaderLogo{background:url(../../images/midasLogo.gif) no-repeat 0 0;cursor:pointer;float:left;height:45px;width:126px;}div.Header div.HeaderSearch{float:left;padding-left:35px;padding-top:6px;position:relative;}div.Header div.HeaderSearch a#advancedSearchLink{bottom:-13px;color:#f3f1ec;position:absolute;right:3px;}div.Header div.HeaderSearch input#live_search{background:#fff url(../../images/icons/search.png) no-repeat scroll 3px 4px;border-radius:4px;border:1px solid #fff;box-shadow:0 0 15px #666;font-size:14px;opacity:0.9;padding:5px 10px 5px 24px;width:400px;}#searchloading{background:url("../../images/icons/loading-small.gif") bottom center no-repeat;color:#fff;height:16px;position:absolute;right:7px;text-decoration:none;top:12px;width:16px;}.search-category{background-color:#f6f9fe;clear:both;color:#333ba0;font-weight:bold;line-height:1.5;}.search-items{background-color:#fff;}div.Header div.HeaderAction{float:left;padding-left:35px;padding-top:7px;}div.HeaderAction ul{display:block;list-style-type:disc;margin:0 25px 0 15px;padding:0;}div.HeaderAction a{color:#fff;display:block;font-size:14px;font-weight:bold;list-style-type:disc;margin:0 5px 0 5px;padding:0;text-decoration:none;}div.HeaderAction a img{border:0;position:relative;top:2px;}div.HeaderAction ul li{background-color:#57bb7d;background-image:-webkit-linear-gradient(top, #57bb7d, #32724a);background-image:linear-gradient(to bottom,#57bb7d, #32724a);border-radius:6px;border:#354856 1px solid;box-shadow:0 0 5px #666;cursor:pointer;display:block;float:left;list-style-type:none;padding:0 5px 6px 5px;}div.HeaderAction ul li:hover{background-color:#5bd288;background-image:-webkit-linear-gradient(top, #5bd288, #429d64);background-image:linear-gradient(to bottom,#5bd288, #429d64);}div.HeaderAction ul img{padding:5px 0 0 0;}div.Wrapper{margin:0 auto;max-width:1200px;min-width:800px;padding:0 30px 30px;}div.SubWrapper{float:left;margin:0;padding:0;position:relative;width:100%;z-index:1;}div.MainContent{float:left;padding-left:130px;position:relative;z-index:1;}div.SubMainContent{background-color:#fff;border-radius:6px;border:1px solid #d7d7d7;box-shadow:0 0 6px #ccc;min-height:500px;padding:0 0 7px;position:relative;width:850px;}div.MainContent a{cursor:pointer;color:#56758b;text-decoration:none;font-weight:500;}div.MainContent a:hover{text-decoration:underline;}div.SideBar{float:left;margin-left:-18%;right:215px;width:150px;}div.SideBar ul{list-style:none;margin:0;padding:0;}div.SideBar ul li{border-bottom:#fff 1px dotted;color:#354856;cursor:pointer;padding-top:3px;}div.SideBar ul li.active{background-color:#e5e5e5;color:#000;}div.SideBar ul li.last{border-bottom:none !important;}div.SideBar ul li:hover{background-color:#e5e5e5;color:#000;}div.SideBar ul li a{color:#808080;font-size:13px;text-decoration:none;}div.SideBar ul li a:hover{text-decoration:none;}div.SideBar ul li a span{left:3px;position:relative;top:-3px;}div.SideBar hr{border-bottom:1px solid #fff;border-top:1px solid #dad8d4;margin:5px -30px 5px 0;}div.SideBar h1{color:#999;font-size:11px;margin-bottom:0.67em;margin-top:0.67em;text-shadow:#fff 0 1px 1px;text-transform:uppercase;}div.viewSideBar h1{color:#999;font-size:11px;margin-bottom:0.67em;margin-top:0.67em;text-shadow:#fff 0 1px 1px;text-transform:uppercase;}div.Footer{clear:both;color:#666;font-size:10px;line-height:1.6em;padding-bottom:10px;padding-top:20px;text-align:center;}div.TopbarRight li ul{border:0;display:none;height:auto;margin:0;padding:4px 0 0 0;position:absolute;width:120px;}div.TopbarRight li:hover ul{display:block;}div.TopbarRight img.arrowUser{position:relative;top:1px;}div.TopbarRight img.languageIcon{position:absolute;right:0;top:0;}div.TopbarRight li li{display:block;float:none;left:-3px;margin:0;padding:0;position:relative;z-index:200;}div.TopbarRight li:hover li a{background:#4b4b4b;color:#fff;z-index:200;}div.TopbarRight li ul a{box-shadow:0 0 5px #666;color:#ddd;display:block;font-size:10px;font-style:normal;height:20px;line-height:17px;margin:0;padding:0 0 0 5px;text-align:left;z-index:200;}div.TopbarRight li ul a:hover{background:#000;text-decoration:none;}div.TopbarRight li ul li:hover a{background:#000;text-decoration:none;}div.TopbarRight p{clear:left;}#dialogStartingGuide .blockSet{border-radius:10px;border:1px solid #ccc;cursor:pointer;float:left;margin:5px;padding:1px;width:262px;}#dialogStartingGuide .blockSet:hover{border:2px solid #d3e8f8;box-shadow:1px 2px 4px #b9b9b9;padding:0;}#seperatorStartingGuide{background-color:#fff;background-image:-webkit-linear-gradient(top, #fff, #c4c4c4);background-image:linear-gradient(to bottom,#fff, #c4c4c4);border-radius:10px;box-shadow:1px 2px 4px #b9b9b9;height:5px;}#dialogStartingGuide h4{margin-bottom:2px;}.growlError{background:url(../../images/icons/nok.png) no-repeat;padding-left:18px;}.growlWarning{background:url(../../images/icons/warning.png) no-repeat;padding-left:18px;}.growlOk{background:url(../../images/icons/ok.png) no-repeat;padding-left:18px;}.recentItem{overflow:hidden;text-overflow:ellipsis;white-space:nowrap;}div.errorText{color:#f00;} +article,aside,details,figcaption,figure,footer,header,hgroup,nav,section,summary{display:block}audio,canvas,video{display:inline-block}audio:not([controls]){display:none;height:0}[hidden],template{display:none}html{background:#fff;color:#000;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%}html,button,input,select,textarea{font-family:sans-serif}body{margin:0}a{background:transparent}a:focus{outline:thin dotted}a:hover,a:active{outline:0}h1{font-size:2em;margin:0.67em 0}h2{font-size:1.5em;margin:0.83em 0}h3{font-size:1.17em;margin:1em 0}h4{font-size:1em;margin:1.33em 0}h5{font-size:0.83em;margin:1.67em 0}h6{font-size:0.75em;margin:2.33em 0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:bold}dfn{font-style:italic}mark{background:#ff0;color:#000}code,kbd,pre,samp{font-family:monospace, serif;font-size:1em}pre{white-space:pre;white-space:pre-wrap;word-wrap:break-word}q{quotes:"\201C" "\201D" "\2018" "\2019"}q:before,q:after{content:'';content:none}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sup{top:-0.5em}sub{bottom:-0.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:0}fieldset{border:1px solid #c0c0c0;margin:0 2px;padding:0.35em 0.625em 0.75em}legend{border:0;padding:0;white-space:normal}button,input,select,textarea{font-family:inherit;font-size:100%;margin:0;vertical-align:baseline}button,input{line-height:normal}button,select{text-transform:none}button,html input[type="button"],input[type="reset"],input[type="submit"]{-webkit-appearance:button;cursor:pointer}button[disabled],input[disabled]{cursor:default}input[type="checkbox"],input[type="radio"]{box-sizing:border-box;padding:0}input[type="search"]{-webkit-appearance:textfield;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box}input[type="search"]::-webkit-search-cancel-button,input[type="search"]::-webkit-search-decoration{-webkit-appearance:none}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}textarea{overflow:auto;vertical-align:top}table{border-collapse:collapse;border-spacing:0}html{background-color:#f3f1ec}body{background-color:#f3f1ec;border:0;font-family:"Lucida Grande", Tahoma, Verdana, Arial, sans-serif;font-size:12px;height:100%;margin:0;min-width:800px;padding:0;text-align:left;width:100%}.clear{clear:both;content:'.';display:block;height:0;visibility:hidden}dl{margin:0;padding:0}img{border:0}a{cursor:pointer}a:visited{border:0;text-decoration:none}a:active{outline:none}a:focus,li:active,li:focus{outline:none}img.thumbnailSmall{height:32px;margin-right:3px;width:32px}.ui-widget{font-family:"Lucida Grande", Tahoma, Verdana, Arial, sans-serif !important;font-size:12px !important}div#guideRobot{display:none}div.genericBigButton{background-color:#fff;background-image:-webkit-linear-gradient(top, #fff, #c4c4c4);background-image:linear-gradient(to bottom,#fff, #c4c4c4);border:#354856 1px solid;border-radius:3px;box-shadow:0 0 2px #666;color:#000;cursor:pointer;display:block;float:left;font-size:12px;font-weight:normal;list-style-type:none;padding:1px 3px 2px}div.genericBigButton a{color:#000 !important;font-size:12px !important;font-weight:normal !important}div.genericBigButton a:hover{text-decoration:none !important}div.genericBigButton:hover{background-color:#bddcc9;background-image:-webkit-linear-gradient(top, #bddcc9, #8ab79b);background-image:linear-gradient(to bottom,#bddcc9, #8ab79b)}div.genericWrapperTopRight{float:right}div.viewAction li a{display:inline-block;padding-bottom:2px}div.viewAction li a:hover{text-decoration:none}div.genericAction li a:hover,div.viewSelected li a:hover{text-decoration:none}div.viewAction li img,div.genericAction li img,div.viewSelected li img{position:relative;top:2px}div.genericAction li:hover{background-color:#e5e5e5;color:#000}div.genericAction li a{display:inline-block;padding-bottom:2px}div.viewAction hr,div.genericAction hr{background-color:#d7d7d7;border:0;color:#d7d7d7;height:1px;margin-bottom:0;margin-left:0;margin-top:3px;width:130px}.jgrowl{font-size:13px !important;font-weight:bold !important;min-width:300px !important;padding-bottom:2px !important;padding-top:2px !important;z-index:15102 !important}.uploadqtip{background-color:#fff !important;border:1px solid #808080 !important;min-width:600px !important}.qtip-titlebar{background-color:#d7d7d7 !important}div.TopDynamicBar{background-color:#4b4b4b;display:none;min-height:50px}div.TopDynamicClose{margin-right:10px;margin-top:0}div.TopDynamicClose a{color:#fff;font-size:12px;text-decoration:none}div.TopDynamicBar .closeButton{float:right}div.TopDynamicBar .closeButton span{left:-3px;position:relative;top:-4px}div.Topbar{background-color:#414141;background-image:-webkit-linear-gradient(bottom, #414141, #4b4b4b);background-image:linear-gradient(to top,#414141, #4b4b4b);border-bottom:2px #354856 solid;font-family:"Lucida Grande", Tahoma, Verdana, Arial, sans-serif;font-size:12px;height:20px;text-align:left;z-index:99}div.Topbar div.TopbarContent{color:#fff;padding-top:4px}div.Topbar div.TopbarLeft{float:left}div.Topbar div.TopbarRight{float:right}div.Topbar ul{display:block;list-style-type:disc;margin:0 25px 0 15px;padding:0;position:relative}div.Topbar ul li{border-left:1px #808080 solid;display:block;float:left;list-style-type:none;margin-left:10px;padding-left:10px;position:relative}div.Topbar ul li.first{border:0;display:block;float:left;list-style-type:none;margin-left:5px;padding-left:5px}div.Topbar li a{color:#ddd;display:block;text-decoration:none}div.Topbar li a:hover{background-color:#1d1d1d;text-decoration:none}div.Header{background-color:#56758b;background-image:-webkit-linear-gradient(bottom, #56758b, #63869f);background-image:linear-gradient(to top,#56758b, #63869f);box-shadow:0 0 3px #666;margin:0 0 15px;padding:5px 30px}div.Header div.HeaderContent{height:45px;margin:0 auto;max-width:1200px;min-width:800px;padding:0}div.Header div.HeaderLogo{background:url('../../images/midasLogo.gif') no-repeat 0 0;cursor:pointer;float:left;height:45px;width:126px}div.Header div.HeaderSearch{float:left;padding-left:35px;padding-top:6px;position:relative}div.Header div.HeaderSearch a#advancedSearchLink{bottom:-13px;color:#f3f1ec;position:absolute;right:3px}div.Header div.HeaderSearch input#live_search{background:#fff url('../../images/icons/search.png') no-repeat scroll 3px 4px;border:1px solid #fff;border-radius:4px;box-shadow:0 0 15px #666;font-size:14px;opacity:0.9;padding:5px 10px 5px 24px;width:400px}#searchloading{background:url('../../images/icons/loading-small.gif') bottom center no-repeat;color:#fff;height:16px;position:absolute;right:7px;text-decoration:none;top:12px;width:16px}.search-category{background-color:#f6f9fe;clear:both;color:#333ba0;font-weight:bold;line-height:1.5}.search-items{background-color:#fff}div.Header div.HeaderAction{float:left;padding-left:35px;padding-top:7px}div.HeaderAction ul{display:block;list-style-type:disc;margin:0 25px 0 15px;padding:0}div.HeaderAction a{color:#fff;display:block;font-size:14px;font-weight:bold;list-style-type:disc;margin:0 5px;padding:0;text-decoration:none}div.HeaderAction a img{border:0;position:relative;top:2px}div.HeaderAction ul li{background-color:#57bb7d;background-image:-webkit-linear-gradient(top, #57bb7d, #32724a);background-image:linear-gradient(to bottom,#57bb7d, #32724a);border:#354856 1px solid;border-radius:6px;box-shadow:0 0 5px #666;cursor:pointer;display:block;float:left;list-style-type:none;padding:0 5px 6px}div.HeaderAction ul li:hover{background-color:#5bd288;background-image:-webkit-linear-gradient(top, #5bd288, #429d64);background-image:linear-gradient(to bottom,#5bd288, #429d64)}div.HeaderAction ul img{padding:5px 0 0}div.Wrapper{margin:0 auto;max-width:1200px;min-width:800px;padding:0 30px 30px}div.SubWrapper{float:left;margin:0;padding:0;position:relative;width:100%;z-index:1}div.MainContent{float:left;padding-left:130px;position:relative;z-index:1}div.SubMainContent{background-color:#fff;border:1px solid #d7d7d7;border-radius:6px;box-shadow:0 0 6px #ccc;min-height:500px;padding:0 0 7px;position:relative;width:850px}div.MainContent a{color:#56758b;cursor:pointer;font-weight:500;text-decoration:none}div.MainContent a:hover{text-decoration:underline}div.SideBar{float:left;margin-left:-18%;right:215px;width:150px}div.SideBar ul{list-style:none;margin:0;padding:0}div.SideBar ul li{border-bottom:#fff 1px dotted;color:#354856;cursor:pointer;padding-top:3px}div.SideBar ul li.active{background-color:#e5e5e5;color:#000}div.SideBar ul li.last{border-bottom:none !important}div.SideBar ul li:hover{background-color:#e5e5e5;color:#000}div.SideBar ul li a{color:#808080;font-size:13px;text-decoration:none}div.SideBar ul li a:hover{text-decoration:none}div.SideBar ul li a span{left:3px;position:relative;top:-3px}div.SideBar hr{border-bottom:1px solid #fff;border-top:1px solid #dad8d4;margin:5px -30px 5px 0}div.SideBar h1{color:#999;font-size:11px;margin-bottom:0.67em;margin-top:0.67em;text-shadow:#fff 0 1px 1px;text-transform:uppercase}div.viewSideBar h1{color:#999;font-size:11px;margin-bottom:0.67em;margin-top:0.67em;text-shadow:#fff 0 1px 1px;text-transform:uppercase}div.Footer{clear:both;color:#666;font-size:10px;line-height:1.6em;padding-bottom:10px;padding-top:20px;text-align:center}div.TopbarRight li ul{border:0;display:none;height:auto;margin:0;padding:4px 0 0;position:absolute;width:120px}div.TopbarRight li:hover ul{display:block}div.TopbarRight img.arrowUser{position:relative;top:1px}div.TopbarRight img.languageIcon{position:absolute;right:0;top:0}div.TopbarRight li li{display:block;float:none;left:-3px;margin:0;padding:0;position:relative;z-index:200}div.TopbarRight li:hover li a{background:#4b4b4b;color:#fff;z-index:200}div.TopbarRight li ul a{box-shadow:0 0 5px #666;color:#ddd;display:block;font-size:10px;font-style:normal;height:20px;line-height:17px;margin:0;padding:0 0 0 5px;text-align:left;z-index:200}div.TopbarRight li ul a:hover{background:#000;text-decoration:none}div.TopbarRight li ul li:hover a{background:#000;text-decoration:none}div.TopbarRight p{clear:left}#dialogStartingGuide .blockSet{border:1px solid #ccc;border-radius:10px;cursor:pointer;float:left;margin:5px;padding:1px;width:262px}#dialogStartingGuide .blockSet:hover{border:2px solid #d3e8f8;box-shadow:1px 2px 4px #b9b9b9;padding:0}#seperatorStartingGuide{background-color:#fff;background-image:-webkit-linear-gradient(top, #fff, #c4c4c4);background-image:linear-gradient(to bottom,#fff, #c4c4c4);border-radius:10px;box-shadow:1px 2px 4px #b9b9b9;height:5px}#dialogStartingGuide h4{margin-bottom:2px}.growlError{background:url('../../images/icons/nok.png') no-repeat;padding-left:18px}.growlWarning{background:url('../../images/icons/warning.png') no-repeat;padding-left:18px}.growlOk{background:url('../../images/icons/ok.png') no-repeat;padding-left:18px}.recentItem{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}div.errorText{color:#f00} diff --git a/core/public/css/layout/view.css b/core/public/css/layout/view.css index dd1273290..9e6bd6ea4 100644 --- a/core/public/css/layout/view.css +++ b/core/public/css/layout/view.css @@ -1 +1 @@ -div.viewHeader{background-color:#f6f9fe;border-bottom:1px solid #dadee5;border-top-left-radius:6px;border-top-right-radius:6px;color:#333ba0;font-size:14px;font-weight:bold;margin:0;min-height:24px;padding:0 0 0 10px;}span.headerSpan{display:inline-block;vertical-align:middle;}div.viewWrapper{margin-top:0;padding-right:275px;position:relative;}div.viewMain{float:left;margin:0;padding:5px 15px;position:relative;width:100%;}div.viewSideBar{background-color:transparent;border-bottom:none;border-left:1px solid #efefef;border-radius:0 0;border-right:none;border-top:none;float:left;height:auto !important;height:100%;margin-right:-300px;min-height:500px;padding-left:10px;padding-top:5px;position:relative;width:215px;z-index:2;}div.viewSelected{display:none;}div.viewNotice{background-color:#45b775;border:1px solid #168846;color:#012844;display:none;padding:2px 10px;position:absolute;}div.viewNoticeWrapper{left:145px;position:relative;top:4px;}div.viewSideBar div.sideElement{border-bottom:1px solid #fff;border-top:1px solid #dad8d4;padding-bottom:10px;}div.viewSideBar div.sideElementFirst{border-top:none !important;padding-bottom:5px;}div.viewSideBar div.sideElementActions{border-bottom:1px solid #fff;border-top:1px solid #dad8d4;padding-top:5px;}div.viewSideBar div.sideElement,div.viewSideBar div.sideElementActions,div.viewSideBar div.sideElementFirst{border-bottom:1px solid #dad8d4;border-top:none !important;padding-bottom:10px;padding-top:3px;}div.viewSideBar div.sideElementLast{border-bottom:none !important;border-top:none !important;padding-bottom:10px;padding-top:5px;}div.viewSideBar div.sideElement ul,div.viewSideBar div.sideElementFirst ul,div.viewSideBar div.sideElementActions ul,div.viewSideBar div.sideElementLast ul{list-style:none;margin:0;padding:0;}ul.pathBrowser{display:block;list-style-type:disc;margin:0;padding-left:0;}ul.pathBrowser li{background:url("../../images/icons/path-divider.png") no-repeat right;display:list-item;float:left;list-style:none;margin:0;min-height:19px;padding:5px 16px 0 3px;}ul.pathBrowser li img{margin-right:2px;position:relative;top:-2px;}ul.pathBrowser li span{position:relative;top:-4px;}ul.pathBrowser li a{color:#333b80;font-size:14px;font-weight:bold;}ul.pathBrowser li a:hover{color:#375;text-decoration:none;}div.ui-tabs{border:0;padding:0 0 0 0 !important;}div.tabs .ui-tabs-nav{background:none !important;border:0 !important;border-bottom:1px dotted #808080;}.ui-state-active,.ui-widget-content .ui-state-active,.ui-widget-header .ui-state-active{border:1px solid #c5dbec !important;}.ui-state-default,.ui-widget-content .ui-state-default,.ui-widget-header .ui-state-default{border:1px solid #f3f1ec;}.ui-widget-content{background:#fff !important;}div.tabs .ui-tabs .ui-tabs-nav li a,.ui-tabs .ui-tabs-nav li a{padding:3px 10px !important;}div.tabs{display:none;}div.tabs .ui-tabs-selected{color:#1d5987 !important;font-weight:bold;height:19px !important;}div.tabs .ui-tabs-selected a{color:#1d5987 !important;font-weight:bold;height:19px !important;}div.tabs .ui-state-default{height:20px;}div.tabs .ui-tabs-panel{border-top:1px solid #f3f1ec;left:-15px !important;position:relative !important;width:99%;}img.progressIndeterminate{display:block;margin-top:13px;margin-bottom:13px;}div.MainDialog h4{border-bottom:1px solid #d7d7d7;color:#555;font-size:14px;margin-bottom:5px;margin-top:0;padding-bottom:3px;padding-top:3px;} +div.viewHeader{background-color:#f6f9fe;border-bottom:1px solid #dadee5;border-top-left-radius:6px;border-top-right-radius:6px;color:#333ba0;font-size:14px;font-weight:bold;margin:0;min-height:24px;padding:0 0 0 10px}span.headerSpan{display:inline-block;vertical-align:middle}div.viewWrapper{margin-top:0;padding-right:275px;position:relative}div.viewMain{float:left;margin:0;padding:5px 15px;position:relative;width:100%}div.viewSideBar{background-color:transparent;border-bottom:0;border-left:1px solid #efefef;border-radius:0;border-right:0;border-top:0;float:left;height:auto !important;margin-right:-300px;min-height:500px;padding-left:10px;padding-top:5px;position:relative;width:215px;z-index:2}div.viewSelected{display:none}div.viewNotice{background-color:#45b775;border:1px solid #168846;color:#012844;display:none;padding:2px 10px;position:absolute}div.viewNoticeWrapper{left:145px;position:relative;top:4px}div.viewSideBar div.sideElement{border-bottom:1px solid #fff;border-top:1px solid #dad8d4;padding-bottom:10px}div.viewSideBar div.sideElementFirst{border-top:none !important;padding-bottom:5px}div.viewSideBar div.sideElementActions{border-bottom:1px solid #fff;border-top:1px solid #dad8d4;padding-top:5px}div.viewSideBar div.sideElement,div.viewSideBar div.sideElementActions,div.viewSideBar div.sideElementFirst{border-bottom:1px solid #dad8d4;border-top:none !important;padding-bottom:10px;padding-top:3px}div.viewSideBar div.sideElementLast{border-bottom:none !important;border-top:none !important;padding-bottom:10px;padding-top:5px}div.viewSideBar div.sideElement ul,div.viewSideBar div.sideElementFirst ul,div.viewSideBar div.sideElementActions ul,div.viewSideBar div.sideElementLast ul{list-style:none;margin:0;padding:0}ul.pathBrowser{display:block;list-style-type:disc;margin:0;padding-left:0}ul.pathBrowser li{background:url('../../images/icons/path-divider.png') no-repeat right;display:list-item;float:left;list-style:none;margin:0;min-height:19px;padding:5px 16px 0 3px}ul.pathBrowser li img{margin-right:2px;position:relative;top:-2px}ul.pathBrowser li span{position:relative;top:-4px}ul.pathBrowser li a{color:#333b80;font-size:14px;font-weight:bold}ul.pathBrowser li a:hover{color:#375;text-decoration:none}div.ui-tabs{border:0;padding:0 !important}div.tabs .ui-tabs-nav{background:none !important;border:0 !important;border-bottom:1px dotted #808080}.ui-state-active,.ui-widget-content .ui-state-active,.ui-widget-header .ui-state-active{border:1px solid #c5dbec !important}.ui-state-default,.ui-widget-content .ui-state-default,.ui-widget-header .ui-state-default{border:1px solid #f3f1ec}.ui-widget-content{background:#fff !important}div.tabs .ui-tabs .ui-tabs-nav li a,.ui-tabs .ui-tabs-nav li a{padding:3px 10px !important}div.tabs{display:none}div.tabs .ui-tabs-selected{color:#1d5987 !important;font-weight:bold;height:19px !important}div.tabs .ui-tabs-selected a{color:#1d5987 !important;font-weight:bold;height:19px !important}div.tabs .ui-state-default{height:20px}div.tabs .ui-tabs-panel{border-top:1px solid #f3f1ec;left:-15px !important;position:relative !important;width:99%}img.progressIndeterminate{display:block;margin-bottom:13px;margin-top:13px}div.MainDialog h4{border-bottom:1px solid #d7d7d7;color:#555;font-size:14px;margin-bottom:5px;margin-top:0;padding-bottom:3px;padding-top:3px} diff --git a/core/public/css/licenses/licenses.index.css b/core/public/css/licenses/licenses.index.css index 40270dd28..c1e25d0a7 100644 --- a/core/public/css/licenses/licenses.index.css +++ b/core/public/css/licenses/licenses.index.css @@ -1 +1 @@ -input.licenseName{margin-bottom:8px !important;width:80% !important;}textarea.licenseText{height:72px !important;width:80% !important;}div.licenseContainer{border-bottom:1px solid #d7d7d7;margin-bottom:15px;}span.headerText{color:#777;font-size:13px;font-weight:bolder;} +input.licenseName{margin-bottom:8px !important;width:80% !important}textarea.licenseText{height:72px !important;width:80% !important}div.licenseContainer{border-bottom:1px solid #d7d7d7;margin-bottom:15px}span.headerText{color:#777;font-size:13px;font-weight:bolder} diff --git a/core/public/css/rest/rest.index.css b/core/public/css/rest/rest.index.css index 9eea93bdd..5ea9a32dc 100644 --- a/core/public/css/rest/rest.index.css +++ b/core/public/css/rest/rest.index.css @@ -1 +1 @@ -div.TopDynamicContent{font-family:"Lucida Grande", Tahoma, Verdana, Arial, sans-serif !important;font-size:13px !important;text-align:left !important;}form#loginForm table{border-collapse:separate !important;border-color:#808080 !important;border-spacing:2px !important;}form#loginForm table tbody tr td{border-bottom:none !important;border-collapse:separate !important;border-color:#808080 !important;border-spacing:2px !important;line-height:normal !important;padding:0 !important;}form#loginForm td{display:table-cell !important;vertical-align:inherit !important;}th{display:table-cell !important;vertical-align:inherit !important;}strong,b{font-weight:bold;}div.SideBar ul li{border-bottom:#fff 1px dotted !important;color:#354856 !important;cursor:pointer !important;padding-top:3px !important;}div.viewMain{width:820px !important;}div.footer{display:none !important;}li.resource{padding:5px !important;}.swagger-ui-wrap{margin-left:auto;margin-right:auto;max-width:auto;}.icon-btn{cursor:pointer;}#message-bar{min-height:30px;padding-top:10px;text-align:center;}.message-success{color:#89bf04;}.message-fail{color:#c00;} +div.TopDynamicContent{font-family:"Lucida Grande", Tahoma, Verdana, Arial, sans-serif !important;font-size:13px !important;text-align:left !important}form#loginForm table{border-collapse:separate !important;border-color:#808080 !important;border-spacing:2px !important}form#loginForm table tbody tr td{border-bottom:none !important;border-collapse:separate !important;border-color:#808080 !important;border-spacing:2px !important;line-height:normal !important;padding:0 !important}form#loginForm td{display:table-cell !important;vertical-align:inherit !important}th{display:table-cell !important;vertical-align:inherit !important}strong,b{font-weight:bold}div.SideBar ul li{border-bottom:#fff 1px dotted !important;color:#354856 !important;cursor:pointer !important;padding-top:3px !important}div.viewMain{width:820px !important}div.footer{display:none !important}li.resource{padding:5px !important}.swagger-ui-wrap{margin-left:auto;margin-right:auto;max-width:auto}.icon-btn{cursor:pointer}#message-bar{min-height:30px;padding-top:10px;text-align:center}.message-success{color:#89bf04}.message-fail{color:#c00} diff --git a/core/public/css/search/search.index.css b/core/public/css/search/search.index.css index ea9a35e7c..1145bab16 100644 --- a/core/public/css/search/search.index.css +++ b/core/public/css/search/search.index.css @@ -1 +1 @@ -ul#searchResults{display:none;list-style:none;margin:0 0 0 0;padding:0 0 0 0;position:relative;}ul#searchResults li.searchElement{border-bottom:1px dotted #808080;margin-top:3px;min-height:40px;position:relative;}img.imageSearchResult{position:relative;top:2px;}a.nameSearchResult{font-weight:bold !important;margin-left:3px;}span.dateSearchResult{bottom:5px;color:#808080;font-size:10px;position:absolute;right:10px;}span.descriptionSearchResult{margin-left:20px;} +ul#searchResults{display:none;list-style:none;margin:0;padding:0;position:relative}ul#searchResults li.searchElement{border-bottom:1px dotted #808080;margin-top:3px;min-height:40px;position:relative}img.imageSearchResult{position:relative;top:2px}a.nameSearchResult{font-weight:bold !important;margin-left:3px}span.dateSearchResult{bottom:5px;color:#808080;font-size:10px;position:absolute;right:10px}span.descriptionSearchResult{margin-left:20px} diff --git a/core/public/css/share/share.dialog.css b/core/public/css/share/share.dialog.css index a08969022..48cb67e77 100644 --- a/core/public/css/share/share.dialog.css +++ b/core/public/css/share/share.dialog.css @@ -1 +1 @@ -input#urlInput{width:300px;}input#live_share_search{width:350px;}div#permissionEntity table{width:330px;}div#permissionEntity table td.changePermissionSelect{width:150px;}div#permissionEntity table td.changePermissionDelete{width:30px;}div#permissionEntity table td.changePermissionSelectBox{width:100px;}div#permissionsContent a{color:#56758b;cursor:pointer;font-weight:500;text-decoration:none;}div#permissionsContent h4{margin-top:10px;}div#permissionsContent a:hover{text-decoration:underline;}div#applyPoliciesRecursiveProgressBar{height:20px;}div#applyPoliciesRecursiveMessage{padding-bottom:5px;padding-top:5px;}#permissionPublic,#permissionPrivate{border-bottom:1px solid #d7d7d7;padding-bottom:10px;} +input#urlInput{width:300px}input#live_share_search{width:350px}div#permissionEntity table{width:330px}div#permissionEntity table td.changePermissionSelect{width:150px}div#permissionEntity table td.changePermissionDelete{width:30px}div#permissionEntity table td.changePermissionSelectBox{width:100px}div#permissionsContent a{color:#56758b;cursor:pointer;font-weight:500;text-decoration:none}div#permissionsContent h4{margin-top:10px}div#permissionsContent a:hover{text-decoration:underline}div#applyPoliciesRecursiveProgressBar{height:20px}div#applyPoliciesRecursiveMessage{padding-bottom:5px;padding-top:5px}#permissionPublic,#permissionPrivate{border-bottom:1px solid #d7d7d7;padding-bottom:10px} diff --git a/core/public/css/share/share.links.css b/core/public/css/share/share.links.css index f63ac3367..b0ffb74ce 100644 --- a/core/public/css/share/share.links.css +++ b/core/public/css/share/share.links.css @@ -1 +1 @@ -#resourceViewDisplay,#resourceDownloadDisplay{height:16px;width:360px;}.viewLinkContainer,.downloadLinkContainer{margin-bottom:20px;}#selectViewUrl,#selectDownloadUrl{background:url(../../images/icons/paste_plain.png) no-repeat 2px 2px;border:1px solid #777;height:22px;position:relative;top:-2px;width:22px;}#selectViewUrl:hover,#selectDownloadUrl:hover{background-color:#ada;cursor:pointer;}.dialogQtip{z-index:15200 !important;} +#resourceViewDisplay,#resourceDownloadDisplay{height:16px;width:360px}.viewLinkContainer,.downloadLinkContainer{margin-bottom:20px}#selectViewUrl,#selectDownloadUrl{background:url('../../images/icons/paste_plain.png') no-repeat 2px 2px;border:1px solid #777;height:22px;position:relative;top:-2px;width:22px}#selectViewUrl:hover,#selectDownloadUrl:hover{background-color:#ada;cursor:pointer}.dialogQtip{z-index:15200 !important} diff --git a/core/public/css/upload/upload.revision.css b/core/public/css/upload/upload.revision.css index f542306d1..aee87e610 100644 --- a/core/public/css/upload/upload.revision.css +++ b/core/public/css/upload/upload.revision.css @@ -1 +1 @@ -#uploadTabs > div{margin-left:10px;}.uploadValidationError{display:none;margin:5px 0;}.uploadValidationError img{position:relative;top:3px;}.hide{display:none;}.progress-current{margin-bottom:13px;}.drop-zone{background-color:#5cb85c;border-radius:5px;border:1px solid #4cae4c;color:#fff;display:inline-block;font-size:16px;font-weight:bold;margin-bottom:8px;padding:14px 20px;}.drop-zone:hover{background-color:#4ca84c;background-image:-webkit-linear-gradient(top, #4ca84c, #5cb85c);background-image:linear-gradient(to bottom,#4ca84c, #5cb85c);border:1px solid #484;cursor:pointer;}.start-upload{background-color:#5c5cb8;border-radius:3px;border:1px solid #4c4cae;color:#fff;cursor:pointer;display:inline-block;font-size:13px;margin:0 0 8px;padding:5px 10px;}#startUploadLink:hover{background-color:#4c4ca8;background-image:-webkit-linear-gradient(top, #4c4ca8, #5c5cb8);background-image:linear-gradient(to bottom,#4c4ca8, #5c5cb8);border:1px solid #448;}.disabled{background:#dedede none !important;border:1px solid #d0d0d0 !important;color:#aaa;cursor:default;}.upload-header{color:#444;font-weight:bold;margin:6px 0;}.upload-status-container{background-color:#fafafa;border-radius:4px;border:1px solid #f0f0f0;box-shadow:inset 0 0 3px 2px rgba(0, 0, 0, 0.02);margin-bottom:12px;margin-right:10px;padding:10px;} +#uploadTabs > div{margin-left:10px}.uploadValidationError{display:none;margin:5px 0}.uploadValidationError img{position:relative;top:3px}.hide{display:none}.progress-current{margin-bottom:13px}.drop-zone{background-color:#5cb85c;border:1px solid #4cae4c;border-radius:5px;color:#fff;display:inline-block;font-size:16px;font-weight:bold;margin-bottom:8px;padding:14px 20px}.drop-zone:hover{background-color:#4ca84c;background-image:-webkit-linear-gradient(top, #4ca84c, #5cb85c);background-image:linear-gradient(to bottom,#4ca84c, #5cb85c);border:1px solid #484;cursor:pointer}.start-upload{background-color:#5c5cb8;border:1px solid #4c4cae;border-radius:3px;color:#fff;cursor:pointer;display:inline-block;font-size:13px;margin:0 0 8px;padding:5px 10px}#startUploadLink:hover{background-color:#4c4ca8;background-image:-webkit-linear-gradient(top, #4c4ca8, #5c5cb8);background-image:linear-gradient(to bottom,#4c4ca8, #5c5cb8);border:1px solid #448}.disabled{background:#dedede none !important;border:1px solid #d0d0d0 !important;color:#aaa;cursor:default}.upload-header{color:#444;font-weight:bold;margin:6px 0}.upload-status-container{background-color:#fafafa;border:1px solid #f0f0f0;border-radius:4px;box-shadow:inset 0 0 3px 2px rgba(0, 0, 0, .02);margin-bottom:12px;margin-right:10px;padding:10px} diff --git a/core/public/css/upload/upload.simpleupload.css b/core/public/css/upload/upload.simpleupload.css index 5c68327ea..c71f39428 100644 --- a/core/public/css/upload/upload.simpleupload.css +++ b/core/public/css/upload/upload.simpleupload.css @@ -1 +1 @@ -#uploadTabs > div{margin-left:10px;}.cluetip-jtip #cluetip-inner{width:94% !important;}div.uploadValidationError{display:none;margin:5px 0;}div.uploadValidationError img{position:relative;top:3px;}.hide{display:none;}.progress-current{margin-bottom:13px;}.drop-zone{background-color:#5cb85c;border-radius:5px;border:1px solid #4cae4c;color:#fff;display:inline-block;font-size:16px;font-weight:bold;margin-bottom:8px;padding:14px 20px;}.drop-zone:hover{background-color:#4ca84c;background-image:-webkit-linear-gradient(top, #4ca84c, #5cb85c);background-image:linear-gradient(to bottom,#4ca84c, #5cb85c);border:1px solid #484;cursor:pointer;}.start-upload{background-color:#5c5cb8;border-radius:3px;border:1px solid #4c4cae;color:#fff;cursor:pointer;display:inline-block;font-size:13px;margin:0 0 8px;padding:5px 10px;}#startUploadLink:hover{background-color:#4c4ca8;background-image:-webkit-linear-gradient(top, #4c4ca8, #5c5cb8);background-image:linear-gradient(to bottom,#4c4ca8, #5c5cb8);border:1px solid #448;}.disabled{background:#dedede none !important;border:1px solid #d0d0d0 !important;color:#aaa;cursor:default;}.upload-header{color:#444;font-weight:bold;margin:6px 0;}.upload-status-container{background-color:#fafafa;border-radius:4px;border:1px solid #f0f0f0;box-shadow:inset 0 0 3px 2px rgba(0, 0, 0, 0.02);margin-bottom:12px;margin-right:10px;padding:10px;}.globalButton{margin-top:3px !important;} +#uploadTabs > div{margin-left:10px}.cluetip-jtip #cluetip-inner{width:94% !important}div.uploadValidationError{display:none;margin:5px 0}div.uploadValidationError img{position:relative;top:3px}.hide{display:none}.progress-current{margin-bottom:13px}.drop-zone{background-color:#5cb85c;border:1px solid #4cae4c;border-radius:5px;color:#fff;display:inline-block;font-size:16px;font-weight:bold;margin-bottom:8px;padding:14px 20px}.drop-zone:hover{background-color:#4ca84c;background-image:-webkit-linear-gradient(top, #4ca84c, #5cb85c);background-image:linear-gradient(to bottom,#4ca84c, #5cb85c);border:1px solid #484;cursor:pointer}.start-upload{background-color:#5c5cb8;border:1px solid #4c4cae;border-radius:3px;color:#fff;cursor:pointer;display:inline-block;font-size:13px;margin:0 0 8px;padding:5px 10px}#startUploadLink:hover{background-color:#4c4ca8;background-image:-webkit-linear-gradient(top, #4c4ca8, #5c5cb8);background-image:linear-gradient(to bottom,#4c4ca8, #5c5cb8);border:1px solid #448}.disabled{background:#dedede none !important;border:1px solid #d0d0d0 !important;color:#aaa;cursor:default}.upload-header{color:#444;font-weight:bold;margin:6px 0}.upload-status-container{background-color:#fafafa;border:1px solid #f0f0f0;border-radius:4px;box-shadow:inset 0 0 3px 2px rgba(0, 0, 0, .02);margin-bottom:12px;margin-right:10px;padding:10px}.globalButton{margin-top:3px !important} diff --git a/core/public/css/user/user.deletedialog.css b/core/public/css/user/user.deletedialog.css index fe33084c3..1e6738a2c 100644 --- a/core/public/css/user/user.deletedialog.css +++ b/core/public/css/user/user.deletedialog.css @@ -1 +1 @@ -span#deleteDialogUserName{font-weight:bold;}span#deleteDialogCaution{color:#b00;font-weight:bolder;} +span#deleteDialogUserName{font-weight:bold}span#deleteDialogCaution{color:#b00;font-weight:bolder} diff --git a/core/public/css/user/user.emailregister.css b/core/public/css/user/user.emailregister.css index 8507d5c7f..07374ecb1 100644 --- a/core/public/css/user/user.emailregister.css +++ b/core/public/css/user/user.emailregister.css @@ -1 +1 @@ -div.viewMain{width:820px !important;}#registerForm{margin-top:20px;}div.emailLabelContainer{height:22px;}div.tosContainer{margin-bottom:10px;margin-top:12px;} +div.viewMain{width:820px !important}#registerForm{margin-top:20px}div.emailLabelContainer{height:22px}div.tosContainer{margin-bottom:10px;margin-top:12px} diff --git a/core/public/css/user/user.index.css b/core/public/css/user/user.index.css index b5cde3a3c..2daf36ffd 100644 --- a/core/public/css/user/user.index.css +++ b/core/public/css/user/user.index.css @@ -1 +1 @@ -div.userBlock{border-bottom:1px dotted #808080;padding-bottom:5px;padding-top:5px;}div.userList span{padding-left:15px;}div.userBlock:hover{background-color:#f6f9fe;cursor:pointer;}.userSubTitle{margin-bottom:5px;margin-top:0;}div.userStats{border:none;color:#777;float:right;font-size:10px;}div.adminCreateUser{margin-top:20px;}div.loginError,div.registerError{color:#f00;font-weight:bold;}div.loginError{padding-bottom:8px;}input.invalidField{background-color:#ff9191;}input.validField{background-color:#91ff91;}.dialogForm{margin-bottom:0;}.dialogForm td{font-size:14px;}.dialogForm input{font-size:14px;}.dialogForm input[type=text],.dialogForm input[type=password]{width:200px;}.dialogForm input[type=button],.dialogForm input[type=submit]{background:#8689de;border-radius:3px;border:0;color:#fff;cursor:pointer;float:right;font-size:13px;font-weight:bold;margin-right:0;margin-top:5px;padding:6px 8px 6px 8px;}.dialogForm input[type=button]:hover,.dialogForm input[type=submit]:hover{background:#cbd9e3;color:#1d5987;text-decoration:none;} +div.userBlock{border-bottom:1px dotted #808080;padding-bottom:5px;padding-top:5px}div.userList span{padding-left:15px}div.userBlock:hover{background-color:#f6f9fe;cursor:pointer}.userSubTitle{margin-bottom:5px;margin-top:0}div.userStats{border:0;color:#777;float:right;font-size:10px}div.adminCreateUser{margin-top:20px}div.loginError,div.registerError{color:#f00;font-weight:bold}div.loginError{padding-bottom:8px}input.invalidField{background-color:#ff9191}input.validField{background-color:#91ff91}.dialogForm{margin-bottom:0}.dialogForm td{font-size:14px}.dialogForm input{font-size:14px}.dialogForm input[type=text],.dialogForm input[type=password]{width:200px}.dialogForm input[type=button],.dialogForm input[type=submit]{background:#8689de;border:0;border-radius:3px;color:#fff;cursor:pointer;float:right;font-size:13px;font-weight:bold;margin-right:0;margin-top:5px;padding:6px 8px}.dialogForm input[type=button]:hover,.dialogForm input[type=submit]:hover{background:#cbd9e3;color:#1d5987;text-decoration:none} diff --git a/core/public/css/user/user.manage.css b/core/public/css/user/user.manage.css index ad5dddc6c..53bd48524 100644 --- a/core/public/css/user/user.manage.css +++ b/core/public/css/user/user.manage.css @@ -1 +1 @@ -div.radioElement label{float:inherit !important;width:600px !important;}div.radioElement ul{list-style:none;margin:0 0 0 100px;padding:0 0 0 0;width:600px !important;}div.radioElement h4{margin-bottom:4px;}div.radioElement br{display:none;}img.folderLoading{display:none;}h1{margin:0;padding:0.2em;}#products{float:left;margin-right:2em;width:500px;}#cart{float:left;width:200px;}#cart ol{margin:0;padding:1em 0 1em 3em;}span.communityTitle{font-size:14px;font-weight:bold;line-height:150%;text-shadow:#fff 0 1px 1px;}.notdraggable{cursor:default;}.draggable{cursor:pointer;}div.communityList{opacity:0.9;}div.communityList span.communityShortDescription{padding-left:15px;} +div.radioElement label{float:inherit !important;width:600px !important}div.radioElement ul{list-style:none;margin:0 0 0 100px;padding:0;width:600px !important}div.radioElement h4{margin-bottom:4px}div.radioElement br{display:none}img.folderLoading{display:none}h1{margin:0;padding:0.2em}#products{float:left;margin-right:2em;width:500px}#cart{float:left;width:200px}#cart ol{margin:0;padding:1em 0 1em 3em}span.communityTitle{font-size:14px;font-weight:bold;line-height:150%;text-shadow:#fff 0 1px 1px}.notdraggable{cursor:default}.draggable{cursor:pointer}div.communityList{opacity:0.9}div.communityList span.communityShortDescription{padding-left:15px} diff --git a/core/public/css/user/user.register.css b/core/public/css/user/user.register.css index ffc5b75ba..b6344dc0b 100644 --- a/core/public/css/user/user.register.css +++ b/core/public/css/user/user.register.css @@ -1 +1 @@ -div.registerContent{margin-left:auto;margin-right:auto;width:900px;}div.registerInfo{background-color:#363535;border-radius:4px;border:1px solid #808080;color:#fff;float:left;margin-bottom:7px;margin-top:15px;padding:8px;width:250px;}div.registerInfo h4{color:#84acc8;margin-bottom:3px;margin-left:5px;margin-top:2px;}div.registerInfo h3{margin-bottom:0;margin-top:0;}div.registerInfo ul{list-style:circle;margin-top:0;padding-left:20px;padding-top:3px;}div.registerInfo li{color:#ddd;}div.registerInfo a{color:#84acc8;font-size:13px;font-weight:bold;text-decoration:underline;}form#registerForm{color:#fff;margin-left:280px;padding-top:19px;}form#registerForm input[type=text],form#registerForm input[type=password]{background:#f3f1ec !important;border:1px solid #808080;color:#000;height:18px;width:185px;}form#registerForm input[type=text]:hover,form#registerForm input[type=password]:hover{background:#fff !important;}form#registerForm div span img{position:relative;top:3px;}form#registerForm .termLabel{display:block;}form#registerForm div.registerError{color:#57bb7d;position:absolute;}form#registerForm div.registerError span{display:none;position:relative;top:-15px;}a.termOfService{color:#f3f1ec;}a.termOfService:hover{color:#f3f1ec;} +div.registerContent{margin-left:auto;margin-right:auto;width:900px}div.registerInfo{background-color:#363535;border:1px solid #808080;border-radius:4px;color:#fff;float:left;margin-bottom:7px;margin-top:15px;padding:8px;width:250px}div.registerInfo h4{color:#84acc8;margin-bottom:3px;margin-left:5px;margin-top:2px}div.registerInfo h3{margin-bottom:0;margin-top:0}div.registerInfo ul{list-style:circle;margin-top:0;padding-left:20px;padding-top:3px}div.registerInfo li{color:#ddd}div.registerInfo a{color:#84acc8;font-size:13px;font-weight:bold;text-decoration:underline}form#registerForm{color:#fff;margin-left:280px;padding-top:19px}form#registerForm input[type=text],form#registerForm input[type=password]{background:#f3f1ec !important;border:1px solid #808080;color:#000;height:18px;width:185px}form#registerForm input[type=text]:hover,form#registerForm input[type=password]:hover{background:#fff !important}form#registerForm div span img{position:relative;top:3px}form#registerForm .termLabel{display:block}form#registerForm div.registerError{color:#57bb7d;position:absolute}form#registerForm div.registerError span{display:none;position:relative;top:-15px}a.termOfService{color:#f3f1ec}a.termOfService:hover{color:#f3f1ec} diff --git a/core/public/css/user/user.settings.css b/core/public/css/user/user.settings.css index 46346d9f2..5526e2abc 100644 --- a/core/public/css/user/user.settings.css +++ b/core/public/css/user/user.settings.css @@ -1 +1 @@ -div#tabsSettings{display:none;width:800px;}form#modifyAccount span{float:left;width:80px;}form#modifyAccount input[type="text"],form#modifyAccount input[type="password"]{width:200px !important;}form#modifyPassword input[type="password"]{width:200px !important;}div#accountPrivacy{margin-left:100px;}div#accountPrivacy label{float:none !important;width:auto !important;}div#accountPrivacy br{display:none;}div#imageActual{float:right;}.ui-tabs-panel h3{margin-top:0;}div#tabsSettings{background:none !important;}div#tabsSettings .ui-tabs-nav{background:none !important;border-bottom:1px solid #d7d7d7 !important;border-left:none !important;border-radius:0;border-right:none !important;border-top:none !important;height:22px !important;padding-left:10px;}div#tabsSettings .ui-widget-content{background:none !important;}div#tabsSettings .ui-tabs .ui-tabs-nav li a{padding:3px 10px !important;}.ui-tabs .ui-tabs-nav li a{padding:3px 10px !important;}div#tabsSettings .ui-tabs-selected{color:#1d5987 !important;font-weight:bold;height:19px !important;}div#tabsSettings .ui-tabs-selected a{color:#1d5987 !important;font-weight:bold;height:19px !important;}div#tabsSettings .ui-state-default{height:20px;}div#tabsSettings .ui-tabs-panel{width:99%;} +div#tabsSettings{display:none;width:800px}form#modifyAccount span{float:left;width:80px}form#modifyAccount input[type='text'],form#modifyAccount input[type='password']{width:200px !important}form#modifyPassword input[type='password']{width:200px !important}div#accountPrivacy{margin-left:100px}div#accountPrivacy label{float:none !important;width:auto !important}div#accountPrivacy br{display:none}div#imageActual{float:right}.ui-tabs-panel h3{margin-top:0}div#tabsSettings{background:none !important}div#tabsSettings .ui-tabs-nav{background:none !important;border-bottom:1px solid #d7d7d7 !important;border-left:none !important;border-radius:0;border-right:none !important;border-top:none !important;height:22px !important;padding-left:10px}div#tabsSettings .ui-widget-content{background:none !important}div#tabsSettings .ui-tabs .ui-tabs-nav li a{padding:3px 10px !important}.ui-tabs .ui-tabs-nav li a{padding:3px 10px !important}div#tabsSettings .ui-tabs-selected{color:#1d5987 !important;font-weight:bold;height:19px !important}div#tabsSettings .ui-tabs-selected a{color:#1d5987 !important;font-weight:bold;height:19px !important}div#tabsSettings .ui-state-default{height:20px}div#tabsSettings .ui-tabs-panel{width:99%} diff --git a/core/public/css/user/user.userpage.css b/core/public/css/user/user.userpage.css index 6bdef3a63..df2927faf 100644 --- a/core/public/css/user/user.userpage.css +++ b/core/public/css/user/user.userpage.css @@ -1 +1 @@ -#locationUser{color:#808080;font-size:10px;}div.sideElementFirst ul li:hover{background-color:#e5e5e5;color:#000;}.websiteBlock li{overflow:hidden;text-overflow:ellipsis;white-space:nowrap;} +#locationUser{color:#808080;font-size:10px}div.sideElementFirst ul li:hover{background-color:#e5e5e5;color:#000}.websiteBlock li{overflow:hidden;text-overflow:ellipsis;white-space:nowrap} diff --git a/modules/api/public/css/index/index.index.css b/modules/api/public/css/index/index.index.css index 528559d1c..469cbade4 100644 --- a/modules/api/public/css/index/index.index.css +++ b/modules/api/public/css/index/index.index.css @@ -1 +1 @@ -div.helpContent{background-color:#ddd;display:none;font-size:10px;margin-bottom:5px;margin-top:5px;}li.methodListElement{margin-bottom:3px;} +div.helpContent{background-color:#ddd;display:none;font-size:10px;margin-bottom:5px;margin-top:5px}li.methodListElement{margin-bottom:3px} diff --git a/modules/archive/public/css/extract/extract.dialog.css b/modules/archive/public/css/extract/extract.dialog.css index b414fe283..b1b0c14cd 100644 --- a/modules/archive/public/css/extract/extract.dialog.css +++ b/modules/archive/public/css/extract/extract.dialog.css @@ -1 +1 @@ -#extractArchiveProgressMessage{margin-bottom:20px;word-wrap:break-word;}#extractArchiveProgressBar{margin-top:15px;}div.archiveExtractPromptText{margin-bottom:10px;margin-top:10px;} +#extractArchiveProgressMessage{margin-bottom:20px;word-wrap:break-word}#extractArchiveProgressBar{margin-top:15px}div.archiveExtractPromptText{margin-bottom:10px;margin-top:10px} diff --git a/modules/cleanup/public/css/item/index.index.css b/modules/cleanup/public/css/item/index.index.css index 63b7625c2..7edaa46c0 100644 --- a/modules/cleanup/public/css/item/index.index.css +++ b/modules/cleanup/public/css/item/index.index.css @@ -1 +1 @@ -div.viewSideBar input.globalButton{margin-left:0 !important;}div.viewWrapper{padding-right:40px !important;} +div.viewSideBar input.globalButton{margin-left:0 !important}div.viewWrapper{padding-right:40px !important} diff --git a/modules/comments/public/css/item/item.comments.css b/modules/comments/public/css/item/item.comments.css index 2a625bb45..57af7e736 100644 --- a/modules/comments/public/css/item/item.comments.css +++ b/modules/comments/public/css/item/item.comments.css @@ -1 +1 @@ -div.addCommentWrapper{border-bottom:1px dashed #c0c0c0;padding-bottom:5px;}div.loginToComment{border-bottom:1px dashed #c0c0c0;padding-bottom:8px;}#registerToComment,#loginToComment{color:#56758b;font-weight:bold;text-decoration:none;}#registerToComment:hover,#loginToComment:hover{cursor:pointer;text-decoration:underline;}#addCommentDiv{border-collapse:separate;border-spacing:0;border:1px solid #bdc7d8;width:100%;}#commentText{border:0;font-family:"Lucida Grande", Tahoma, Verdana, Arial, sans-serif;font-size:13px;height:25px;margin-bottom:0;outline:0;padding:2px;resize:none;width:99%;}.commentLimit,.commentAs{border-right:1px solid #e2e2e2;color:#777;float:left;font-size:11px;height:100%;padding-left:5px;padding-right:5px;}.commentLimitString,.postingAsString{margin-top:5px;}div.addCommentFooter{background-color:#f2f2f2;border-top:1px solid #e2e2e2;height:26px;margin:0;}#postingAsUsername{color:#555;}#addCommentButton{float:right;margin-right:4px;}#existingCommentsList{width:100%;}.aComment{border-bottom:1px solid #c0c0c0;min-height:32px;padding-bottom:10px;padding-top:10px;width:100%;}a.commentUserName{color:#56758b;font-weight:bold !important;margin-left:8px;text-decoration:none;}a.commentUserName:visited{color:#56758b;font-weight:bold !important;margin-left:8px;text-decoration:none;}a.commentUserName:hover{text-decoration:underline;}.commentTextDiv{margin-left:40px;margin-top:8px;}.commentDate{color:#969696;}.commentThumbnail{float:left;}img.deleteCommentIcon{cursor:pointer;float:right;}div.commentsBottomMessage{color:#969696;margin-top:8px;}#refreshingCommentDiv{margin-top:5px;}span.loadingCommentsMessage{color:#969696;}div.commentPaginateWrapper{margin-top:8px;}a.commentItrLink{color:#56758b;font-family:"Lucida Grande", Tahoma, Verdana, Arial, sans-serif;font-size:13px;font-weight:bold;text-decoration:none;}a.commentItrLink:visited{color:#56758b;font-family:"Lucida Grande", Tahoma, Verdana, Arial, sans-serif;font-size:13px;font-weight:bold;text-decoration:none;}a.commentItrLink:hover{color:#b85541;text-decoration:underline;} +div.addCommentWrapper{border-bottom:1px dashed #c0c0c0;padding-bottom:5px}div.loginToComment{border-bottom:1px dashed #c0c0c0;padding-bottom:8px}#registerToComment,#loginToComment{color:#56758b;font-weight:bold;text-decoration:none}#registerToComment:hover,#loginToComment:hover{cursor:pointer;text-decoration:underline}#addCommentDiv{border:1px solid #bdc7d8;border-collapse:separate;border-spacing:0;width:100%}#commentText{border:0;font-family:"Lucida Grande", Tahoma, Verdana, Arial, sans-serif;font-size:13px;height:25px;margin-bottom:0;outline:0;padding:2px;resize:none;width:99%}.commentLimit,.commentAs{border-right:1px solid #e2e2e2;color:#777;float:left;font-size:11px;height:100%;padding-left:5px;padding-right:5px}.commentLimitString,.postingAsString{margin-top:5px}div.addCommentFooter{background-color:#f2f2f2;border-top:1px solid #e2e2e2;height:26px;margin:0}#postingAsUsername{color:#555}#addCommentButton{float:right;margin-right:4px}#existingCommentsList{width:100%}.aComment{border-bottom:1px solid #c0c0c0;min-height:32px;padding-bottom:10px;padding-top:10px;width:100%}a.commentUserName{color:#56758b;font-weight:bold !important;margin-left:8px;text-decoration:none}a.commentUserName:visited{color:#56758b;font-weight:bold !important;margin-left:8px;text-decoration:none}a.commentUserName:hover{text-decoration:underline}.commentTextDiv{margin-left:40px;margin-top:8px}.commentDate{color:#969696}.commentThumbnail{float:left}img.deleteCommentIcon{cursor:pointer;float:right}div.commentsBottomMessage{color:#969696;margin-top:8px}#refreshingCommentDiv{margin-top:5px}span.loadingCommentsMessage{color:#969696}div.commentPaginateWrapper{margin-top:8px}a.commentItrLink{color:#56758b;font-family:"Lucida Grande", Tahoma, Verdana, Arial, sans-serif;font-size:13px;font-weight:bold;text-decoration:none}a.commentItrLink:visited{color:#56758b;font-family:"Lucida Grande", Tahoma, Verdana, Arial, sans-serif;font-size:13px;font-weight:bold;text-decoration:none}a.commentItrLink:hover{color:#b85541;text-decoration:underline} diff --git a/modules/communityagreement/public/css/community/community.agreementdialog.css b/modules/communityagreement/public/css/community/community.agreementdialog.css index b8c13060d..d6a84a23a 100644 --- a/modules/communityagreement/public/css/community/community.agreementdialog.css +++ b/modules/communityagreement/public/css/community/community.agreementdialog.css @@ -1 +1 @@ -div.agreementWarning{background-color:#e7ffd1;border-radius:3px;border:#3a3 1px solid;box-shadow:0 0 2px #666;color:#000;display:block;font-size:12px;font-weight:normal;list-style-type:none;margin-bottom:12px;padding:1px 4px 4px 4px;}div.licenseDisplay{border-bottom:#d7d7d7 1px solid;border-top:#d7d7d7 1px solid;margin-bottom:8px;max-height:180px;overflow:auto;padding-bottom:8px;padding-top:8px;}div.agreementWarning img{padding:0;position:relative;top:3px;}div.agreementButtons{float:right;margin-top:10px;} +div.agreementWarning{background-color:#e7ffd1;border:#3a3 1px solid;border-radius:3px;box-shadow:0 0 2px #666;color:#000;display:block;font-size:12px;font-weight:normal;list-style-type:none;margin-bottom:12px;padding:1px 4px 4px}div.licenseDisplay{border-bottom:#d7d7d7 1px solid;border-top:#d7d7d7 1px solid;margin-bottom:8px;max-height:180px;overflow:auto;padding-bottom:8px;padding-top:8px}div.agreementWarning img{padding:0;position:relative;top:3px}div.agreementButtons{float:right;margin-top:10px} diff --git a/modules/communityagreement/public/css/community/community.agreementtab.css b/modules/communityagreement/public/css/community/community.agreementtab.css index 56b19ac0c..530394e6e 100644 --- a/modules/communityagreement/public/css/community/community.agreementtab.css +++ b/modules/communityagreement/public/css/community/community.agreementtab.css @@ -1 +1 @@ -textarea#agreement{height:160px;width:100% !important;}div.formLabel{color:#999;font-size:11px;font-weight:bold;margin-bottom:0.67em;margin-top:0.67em;text-transform:uppercase;}#createAgreementForm input[type=submit]{margin-left:0 !important;} +textarea#agreement{height:160px;width:100% !important}div.formLabel{color:#999;font-size:11px;font-weight:bold;margin-bottom:0.67em;margin-top:0.67em;text-transform:uppercase}#createAgreementForm input[type=submit]{margin-left:0 !important} diff --git a/modules/dicomanonymize/public/css/upload/upload.index.css b/modules/dicomanonymize/public/css/upload/upload.index.css index d600ef394..f358af398 100644 --- a/modules/dicomanonymize/public/css/upload/upload.index.css +++ b/modules/dicomanonymize/public/css/upload/upload.index.css @@ -1 +1 @@ -div.chooseFolderMessage{margin-bottom:10px;margin-top:10px;padding-right:18px;} +div.chooseFolderMessage{margin-bottom:10px;margin-top:10px;padding-right:18px} diff --git a/modules/dicomserver/public/css/admin/admin.index.css b/modules/dicomserver/public/css/admin/admin.index.css index 99ce704db..35fe6cef4 100644 --- a/modules/dicomserver/public/css/admin/admin.index.css +++ b/modules/dicomserver/public/css/admin/admin.index.css @@ -1 +1 @@ -span.running_status{color:#090;font-weight:bold;}span.not_running_status,span.only_storescp_running_status,span.only_dcmqrscp_running_status,span.not_supported_status{color:#c80000;font-weight:bold;}textarea#apicall_failure_reason{color:#c80000;font-weight:bold;}div.manualCommandsWrapper li{margin:10px 0;}span.set_bold{font-weight:bold;} +span.running_status{color:#090;font-weight:bold}span.not_running_status,span.only_storescp_running_status,span.only_dcmqrscp_running_status,span.not_supported_status{color:#c80000;font-weight:bold}textarea#apicall_failure_reason{color:#c80000;font-weight:bold}div.manualCommandsWrapper li{margin:10px 0}span.set_bold{font-weight:bold} diff --git a/modules/javauploaddownload/public/css/download/download.index.css b/modules/javauploaddownload/public/css/download/download.index.css index d6d342cf1..5da5f8931 100644 --- a/modules/javauploaddownload/public/css/download/download.index.css +++ b/modules/javauploaddownload/public/css/download/download.index.css @@ -1 +1 @@ -.downloadDescription{background-color:#afa;border-radius:5px;border:2px solid #9d9;margin-top:6px;padding:6px 5px 6px 8px;}.descriptionImage{float:left;margin-right:5px;position:relative;top:-1px;}.downloadInstructions{margin-top:12px;}.pointToDownload{margin-left:25px;} +.downloadDescription{background-color:#afa;border:2px solid #9d9;border-radius:5px;margin-top:6px;padding:6px 5px 6px 8px}.descriptionImage{float:left;margin-right:5px;position:relative;top:-1px}.downloadInstructions{margin-top:12px}.pointToDownload{margin-left:25px} diff --git a/modules/javauploaddownload/public/css/upload/upload.index.css b/modules/javauploaddownload/public/css/upload/upload.index.css index 7ab4f192b..789963ce7 100644 --- a/modules/javauploaddownload/public/css/upload/upload.index.css +++ b/modules/javauploaddownload/public/css/upload/upload.index.css @@ -1 +1 @@ -.belowDestinationUpload{display:none;}.browseMIDASLink{margin-left:0;}.globalButton{margin-top:3px !important;} +.belowDestinationUpload{display:none}.browseMIDASLink{margin-left:0}.globalButton{margin-top:3px !important} diff --git a/modules/javauploaddownload/public/css/upload/upload.revision.css b/modules/javauploaddownload/public/css/upload/upload.revision.css index 2f9dd6139..e4492e810 100644 --- a/modules/javauploaddownload/public/css/upload/upload.revision.css +++ b/modules/javauploaddownload/public/css/upload/upload.revision.css @@ -1 +1 @@ -.belowDestinationUpload{display:none;}.revisionChanges{width:80%;} +.belowDestinationUpload{display:none}.revisionChanges{width:80%} diff --git a/modules/keyfiles/public/css/item/keyfiles.item.view.css b/modules/keyfiles/public/css/item/keyfiles.item.view.css index 4b4503117..4a997da51 100644 --- a/modules/keyfiles/public/css/item/keyfiles.item.view.css +++ b/modules/keyfiles/public/css/item/keyfiles.item.view.css @@ -1 +1 @@ -img.downloadKeyFileIcon{cursor:pointer;float:right;padding-left:2px;padding-right:2px;} +img.downloadKeyFileIcon{cursor:pointer;float:right;padding-left:2px;padding-right:2px} diff --git a/modules/mfa/public/css/config/config.index.css b/modules/mfa/public/css/config/config.index.css index 579f91a94..c7bb6d47c 100644 --- a/modules/mfa/public/css/config/config.index.css +++ b/modules/mfa/public/css/config/config.index.css @@ -1 +1 @@ -.formElement{margin-top:10px;}.saveButton{margin-top:15px;} +.formElement{margin-top:10px}.saveButton{margin-top:15px} diff --git a/modules/mfa/public/css/config/config.usertab.css b/modules/mfa/public/css/config/config.usertab.css index 115df645c..b65bfefdb 100644 --- a/modules/mfa/public/css/config/config.usertab.css +++ b/modules/mfa/public/css/config/config.usertab.css @@ -1 +1 @@ -#otpLength{width:25px;} +#otpLength{width:25px} diff --git a/modules/mfa/public/css/login/login.dialog.css b/modules/mfa/public/css/login/login.dialog.css index ed10e03b2..b747d4f00 100644 --- a/modules/mfa/public/css/login/login.dialog.css +++ b/modules/mfa/public/css/login/login.dialog.css @@ -1 +1 @@ -#otpLoginSubmit{float:right;margin-top:10px;}#otpToken{background:#fff url(../../../../../core/public/images/icons/lock.png) no-repeat scroll 2px 2px;padding-left:20px;width:90%;} +#otpLoginSubmit{float:right;margin-top:10px}#otpToken{background:#fff url('../../../../../core/public/images/icons/lock.png') no-repeat scroll 2px 2px;padding-left:20px;width:90%} diff --git a/modules/oauth/public/css/authorize/authorize.index.css b/modules/oauth/public/css/authorize/authorize.index.css index a14e91a74..bf0e07917 100644 --- a/modules/oauth/public/css/authorize/authorize.index.css +++ b/modules/oauth/public/css/authorize/authorize.index.css @@ -1 +1 @@ -body{background-color:#f5f5f5;padding-bottom:40px;padding-top:40px;}.form-login{background-color:#fafafa;border-radius:5px;border:1px solid #e5e5e5;box-shadow:0 1px 2px rgba(0, 0, 0, 0.05);margin:0 auto 20px;max-width:600px;padding:19px 29px 29px;}.form-login .form-login-heading,.form-login .checkbox{margin-bottom:10px;}.form-login input[type="text"],.form-login input[type="password"]{font-size:16px;height:auto;margin-bottom:15px;padding:7px 9px;}.btn{margin:10px 0 15px 12px;}ul.scopeList{margin-top:8px;}div.authorizationText{background-color:#ffb;border-radius:5px;border:1px solid #c0c0c0;box-shadow:0 1px 2px rgba(0, 0, 0, 0.05);margin-bottom:18px;padding:10px 12px 5px 12px;}div.loginErrorMessage{color:#ee1010;font-weight:bold;margin-bottom:10px;}div.logoContainer{border-bottom:1px solid #d7d7d7;margin-bottom:12px;margin-top:-10px;padding-bottom:8px;text-align:right;}div.buttonBar{text-align:right;}img.secureImage{position:relative;top:-2px;} +body{background-color:#f5f5f5;padding-bottom:40px;padding-top:40px}.form-login{background-color:#fafafa;border:1px solid #e5e5e5;border-radius:5px;box-shadow:0 1px 2px rgba(0, 0, 0, .05);margin:0 auto 20px;max-width:600px;padding:19px 29px 29px}.form-login .form-login-heading,.form-login .checkbox{margin-bottom:10px}.form-login input[type='text'],.form-login input[type='password']{font-size:16px;height:auto;margin-bottom:15px;padding:7px 9px}.btn{margin:10px 0 15px 12px}ul.scopeList{margin-top:8px}div.authorizationText{background-color:#ffb;border:1px solid #c0c0c0;border-radius:5px;box-shadow:0 1px 2px rgba(0, 0, 0, .05);margin-bottom:18px;padding:10px 12px 5px}div.loginErrorMessage{color:#ee1010;font-weight:bold;margin-bottom:10px}div.logoContainer{border-bottom:1px solid #d7d7d7;margin-bottom:12px;margin-top:-10px;padding-bottom:8px;text-align:right}div.buttonBar{text-align:right}img.secureImage{position:relative;top:-2px} diff --git a/modules/oauth/public/css/client/client.index.css b/modules/oauth/public/css/client/client.index.css index acb91cc9f..02897ea2c 100644 --- a/modules/oauth/public/css/client/client.index.css +++ b/modules/oauth/public/css/client/client.index.css @@ -1 +1 @@ -div.sectionHeader{color:#666;display:inline;float:left;font-size:16px;margin-bottom:5px;padding-top:3px;}div.sectionContainer{margin-bottom:30px;padding-top:6px;}.myClientsTable th,.myAuthorizationsTable th{background-color:#dde4e4;font-weight:normal;padding:3px 10px 3px 5px;}.myClientsTable td,.myAuthorizationsTable td{background-color:#fbfbfb;padding:3px;}.myClientsTable,.myAuthorizationsTable{width:100%;}.noClientsMessage{color:#888;font-style:italic;padding-left:5px;}.newClientButton{float:left;margin-left:10px;padding-bottom:2px;}div.bottomButtons{float:right;margin-top:25px;}div.bottomButtons input{margin-left:10px;} +div.sectionHeader{color:#666;display:inline;float:left;font-size:16px;margin-bottom:5px;padding-top:3px}div.sectionContainer{margin-bottom:30px;padding-top:6px}.myClientsTable th,.myAuthorizationsTable th{background-color:#dde4e4;font-weight:normal;padding:3px 10px 3px 5px}.myClientsTable td,.myAuthorizationsTable td{background-color:#fbfbfb;padding:3px}.myClientsTable,.myAuthorizationsTable{width:100%}.noClientsMessage{color:#888;font-style:italic;padding-left:5px}.newClientButton{float:left;margin-left:10px;padding-bottom:2px}div.bottomButtons{float:right;margin-top:25px}div.bottomButtons input{margin-left:10px} diff --git a/modules/packages/public/css/application/packages.application.latest.css b/modules/packages/public/css/application/packages.application.latest.css index d96798e18..dfc7ea96a 100644 --- a/modules/packages/public/css/application/packages.application.latest.css +++ b/modules/packages/public/css/application/packages.application.latest.css @@ -1 +1 @@ -div.viewMain{width:805px;}div.viewMain h2{color:#545454;font-size:15px;margin-top:5px;}#platformList{margin-top:15px;}#platformList h3 a{text-decoration:none;}div.platformContainer{border-top:1px solid #a7a7a7 !important;padding-left:13px !important;padding-right:13px !important;padding-top:10px !important;}table.packagesTable{border-collapse:collapse;border:0;width:100%;}table.packagesTable a img{position:relative;top:2px;}table.packagesTable td{border:1px solid #d7d7d7;padding-bottom:3px;padding-left:4px;padding-top:2px;}table.packagesTable tr.odd{background-color:#f4f4f4;}table.packagesTable tr.even{background-color:#fff;}div.platformContainerTitle{color:#666;font-weight:bold;margin-bottom:7px;} +div.viewMain{width:805px}div.viewMain h2{color:#545454;font-size:15px;margin-top:5px}#platformList{margin-top:15px}#platformList h3 a{text-decoration:none}div.platformContainer{border-top:1px solid #a7a7a7 !important;padding-left:13px !important;padding-right:13px !important;padding-top:10px !important}table.packagesTable{border:0;border-collapse:collapse;width:100%}table.packagesTable a img{position:relative;top:2px}table.packagesTable td{border:1px solid #d7d7d7;padding-bottom:3px;padding-left:4px;padding-top:2px}table.packagesTable tr.odd{background-color:#f4f4f4}table.packagesTable tr.even{background-color:#fff}div.platformContainerTitle{color:#666;font-weight:bold;margin-bottom:7px} diff --git a/modules/packages/public/css/application/packages.application.view.css b/modules/packages/public/css/application/packages.application.view.css index cc31076f1..21fe15cd7 100644 --- a/modules/packages/public/css/application/packages.application.view.css +++ b/modules/packages/public/css/application/packages.application.view.css @@ -1 +1 @@ -div.titleWrapper{border-bottom:1px solid #d7d7d7;}div.applicationName{color:#525252;font-size:20px;font-weight:bold;margin-bottom:5px;}div.applicationDescription{color:#6d6d6d;margin-bottom:8px;}#packageList{margin-top:15px;}#packageList h3 a{text-decoration:none;}div.releaseEntry{border-top:1px solid #a7a7a7 !important;padding-left:13px !important;padding-right:13px !important;}table.packagesTable{border-collapse:collapse;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;width:550px;}table.packagesTable th{background-color:#ccd7e0;border:1px #888 solid;font-family:"Lucida Grande", Tahoma, Verdana, Arial, sans-serif;padding-bottom:5px;padding-left:5px;padding-top:5px;}th.actions{width:40%;}th.platform,th.type{width:30%;}table.packagesTable tbody td{border:1px solid #a7a7a7;font-family:"Lucida Grande", Tahoma, Verdana, Arial, sans-serif;padding-bottom:3px;padding-left:3px;padding-top:3px;}table.packagesTable tbody td img{position:relative;top:2px;}form.editApplication input[type=text]{width:300px;}form.editApplication textarea{resize:none;width:298px;} +div.titleWrapper{border-bottom:1px solid #d7d7d7}div.applicationName{color:#525252;font-size:20px;font-weight:bold;margin-bottom:5px}div.applicationDescription{color:#6d6d6d;margin-bottom:8px}#packageList{margin-top:15px}#packageList h3 a{text-decoration:none}div.releaseEntry{border-top:1px solid #a7a7a7 !important;padding-left:13px !important;padding-right:13px !important}table.packagesTable{-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;border-collapse:collapse;width:550px}table.packagesTable th{background-color:#ccd7e0;border:1px #888 solid;font-family:"Lucida Grande", Tahoma, Verdana, Arial, sans-serif;padding-bottom:5px;padding-left:5px;padding-top:5px}th.actions{width:40%}th.platform,th.type{width:30%}table.packagesTable tbody td{border:1px solid #a7a7a7;font-family:"Lucida Grande", Tahoma, Verdana, Arial, sans-serif;padding-bottom:3px;padding-left:3px;padding-top:3px}table.packagesTable tbody td img{position:relative;top:2px}form.editApplication input[type=text]{width:300px}form.editApplication textarea{resize:none;width:298px} diff --git a/modules/packages/public/css/package/package.manage.css b/modules/packages/public/css/package/package.manage.css index 06a33e684..eba3880a9 100644 --- a/modules/packages/public/css/package/package.manage.css +++ b/modules/packages/public/css/package/package.manage.css @@ -1 +1 @@ -div.viewMain{width:805px;}div.viewMain h2{color:#545454;margin-bottom:3px;margin-top:3px;}div.headerSection{border-bottom:1px solid #d7d7d7;margin-bottom:10px;padding-bottom:8px;} +div.viewMain{width:805px}div.viewMain h2{color:#545454;margin-bottom:3px;margin-top:3px}div.headerSection{border-bottom:1px solid #d7d7d7;margin-bottom:10px;padding-bottom:8px} diff --git a/modules/packages/public/css/view/packages.view.project.css b/modules/packages/public/css/view/packages.view.project.css index 218467832..b73cba35d 100644 --- a/modules/packages/public/css/view/packages.view.project.css +++ b/modules/packages/public/css/view/packages.view.project.css @@ -1 +1 @@ -div.introText{margin-bottom:20px;}div.applicationList a.applicationLink{font-size:18px;font-weight:bold;text-decoration:none;}div.applicationList a.applicationLink:hover{text-decoration:underline;}div.noApplications{font-style:italic;}div.applicationDescription{margin-top:6px;}div.applicationContainer{border-top:1px solid #d7d7d7;margin-top:20px;padding-top:8px;}div.createApplicationContainer{border-top:1px solid #d7d7d7;margin-top:20px;padding-top:10px;}form.createApplication input[type=text]{width:300px;}form.createApplication textarea{resize:none;width:298px;} +div.introText{margin-bottom:20px}div.applicationList a.applicationLink{font-size:18px;font-weight:bold;text-decoration:none}div.applicationList a.applicationLink:hover{text-decoration:underline}div.noApplications{font-style:italic}div.applicationDescription{margin-top:6px}div.applicationContainer{border-top:1px solid #d7d7d7;margin-top:20px;padding-top:8px}div.createApplicationContainer{border-top:1px solid #d7d7d7;margin-top:20px;padding-top:10px}form.createApplication input[type=text]{width:300px}form.createApplication textarea{resize:none;width:298px} diff --git a/modules/pvw/public/css/admin/admin.status.css b/modules/pvw/public/css/admin/admin.status.css index 66eb5ef10..b108212f3 100644 --- a/modules/pvw/public/css/admin/admin.status.css +++ b/modules/pvw/public/css/admin/admin.status.css @@ -1 +1 @@ -table.instances{border-collapse:collapse;}table.instances th{background-color:#bdd;border:1px solid #d7d7d7;padding:3px;}table.instances td{border:1px solid #d7d7d7;padding:3px;}span.running{color:#008000;}span.dead{color:#f00;}img.killInstance:hover{cursor:pointer;} +table.instances{border-collapse:collapse}table.instances th{background-color:#bdd;border:1px solid #d7d7d7;padding:3px}table.instances td{border:1px solid #d7d7d7;padding:3px}span.running{color:#008000}span.dead{color:#f00}img.killInstance:hover{cursor:pointer} diff --git a/modules/pvw/public/css/paraview/paraview.common.css b/modules/pvw/public/css/paraview/paraview.common.css index 74bc911ae..9a5b51a5c 100644 --- a/modules/pvw/public/css/paraview/paraview.common.css +++ b/modules/pvw/public/css/paraview/paraview.common.css @@ -1 +1 @@ -div.midas-pvw-status{font-size:14px;margin-bottom:10px;margin-top:10px;}#renderercontainer{display:none;height:575px;overflow:hidden;position:relative;width:575px;z-index:2;}#rendererOverlay{position:absolute;right:15px;top:15px;z-index:1005;} +div.midas-pvw-status{font-size:14px;margin-bottom:10px;margin-top:10px}#renderercontainer{display:none;height:575px;overflow:hidden;position:relative;width:575px;z-index:2}#rendererOverlay{position:absolute;right:15px;top:15px;z-index:1005} diff --git a/modules/pvw/public/css/paraview/paraview.slice.css b/modules/pvw/public/css/paraview/paraview.slice.css index 33c8b0bfd..958b9f909 100644 --- a/modules/pvw/public/css/paraview/paraview.slice.css +++ b/modules/pvw/public/css/paraview/paraview.slice.css @@ -1 +1 @@ -#sliceSlider,#windowLevelSlider{margin:8px 14px 8px 10px;width:551px;}#sliceInfo,#windowLevelInfo{color:#fff;margin-left:10px;z-index:3;}#renderercontainer{display:none;height:575px;overflow:hidden;position:relative;width:575px;z-index:2;}img.visuLoading{margin-left:10px;margin-top:10px;z-index:100;}#rendererOverlay{position:absolute;right:15px;top:40px;z-index:1005;}#sliceControlContainer{position:absolute;top:5px;z-index:1005;}#windowLevelControlContainer{bottom:5px;position:absolute;z-index:1005;}button.actionButton{background:no-repeat 2px 1px;height:25px;width:25px;}button.actionActive{background-color:#9c9;}button.actionInactive{background-color:#ccc;}button.pointSelectButton{background-image:url(../../images/pointSelect.png);}#loadingStatus{margin-left:10px;}span.infoValue{color:#7a7a7a;} +#sliceSlider,#windowLevelSlider{margin:8px 14px 8px 10px;width:551px}#sliceInfo,#windowLevelInfo{color:#fff;margin-left:10px;z-index:3}#renderercontainer{display:none;height:575px;overflow:hidden;position:relative;width:575px;z-index:2}img.visuLoading{margin-left:10px;margin-top:10px;z-index:100}#rendererOverlay{position:absolute;right:15px;top:40px;z-index:1005}#sliceControlContainer{position:absolute;top:5px;z-index:1005}#windowLevelControlContainer{bottom:5px;position:absolute;z-index:1005}button.actionButton{background:no-repeat 2px 1px;height:25px;width:25px}button.actionActive{background-color:#9c9}button.actionInactive{background-color:#ccc}button.pointSelectButton{background-image:url('../../images/pointSelect.png')}#loadingStatus{margin-left:10px}span.infoValue{color:#7a7a7a} diff --git a/modules/pvw/public/css/paraview/paraview.surface.css b/modules/pvw/public/css/paraview/paraview.surface.css index 16d5cfa82..f2566d20f 100644 --- a/modules/pvw/public/css/paraview/paraview.surface.css +++ b/modules/pvw/public/css/paraview/paraview.surface.css @@ -1 +1 @@ -#renderercontainer{display:none;height:575px;overflow:hidden;position:relative;width:575px;z-index:2;}#renderer-type{position:absolute;right:60px;top:8px;width:100px;z-index:5;}#loadingStatus{margin-left:10px;}span.infoValue{color:#7a7a7a;}#rendererSelect{width:100%;} +#renderercontainer{display:none;height:575px;overflow:hidden;position:relative;width:575px;z-index:2}#renderer-type{position:absolute;right:60px;top:8px;width:100px;z-index:5}#loadingStatus{margin-left:10px}span.infoValue{color:#7a7a7a}#rendererSelect{width:100%} diff --git a/modules/pvw/public/css/paraview/paraview.volume.css b/modules/pvw/public/css/paraview/paraview.volume.css index 72bc25f02..e1c9190e1 100644 --- a/modules/pvw/public/css/paraview/paraview.volume.css +++ b/modules/pvw/public/css/paraview/paraview.volume.css @@ -1 +1 @@ -span.infoValue{color:#7a7a7a;}table.extractSubgridTable td{padding-bottom:20px;}table.extractSubgridTable input.sb{border:1px solid #808080;width:55px;}.sliderX,.sliderY,.sliderZ{margin-left:11px;margin-right:11px;width:370px;}button.cameraPreset{background:no-repeat 3px 3px;border:1px solid #aaa;height:32px;margin-right:10px;width:32px;}button.plusX{background-image:url(../../images/pqXPlus24.png);}button.minusX{background-image:url(../../images/pqXMinus24.png);}button.plusY{background-image:url(../../images/pqYPlus24.png);}button.minusY{background-image:url(../../images/pqYMinus24.png);}button.plusZ{background-image:url(../../images/pqZPlus24.png);}button.minusZ{background-image:url(../../images/pqZMinus24.png);}button.cameraPreset:hover{background-color:#ada;}div.sofBottomButtons{float:right;margin-top:15px;}div.sofPointEdit{display:none;margin-top:10px;float:right;}input.scalarValueEdit,input.opacityValueEdit{border:1px solid #808080;margin-left:5px;margin-right:10px;width:65px;}.scmColorPicker{background:url(../../images/select2.png) -3px -3px;cursor:pointer;display:inline-block;height:30px;margin-left:5px;margin-top:-4px;position:absolute;width:30px;}input.scmScalarValue{border:1px solid #808080;margin-left:5px;margin-right:15px;width:50px;}div.rgbPointContainer{margin-bottom:10px;margin-top:10px;}div.scmDivider{border-top:1px solid #d7d7d7;}div.scmBottomButtons{float:right;padding-top:10px;}button.scmDeletePoint{margin-left:48px;position:relative;}table.objectList{border-collapse:collapse;width:100%;}table.objectList th{background-color:#d0d0f6;border:1px solid #808080;padding-left:4px;}table.objectList th.visibility{width:20px;}table.objectList td{border:1px solid #808080;padding-left:2px;}div.objectListBottomButtons{float:right;margin-top:10px;}#loadingStatus{margin-left:10px;}div.presetSelectionContainer{border-bottom:1px solid #d7d7d7;margin-bottom:10px;padding-bottom:6px;padding-top:8px;}select.scmPresets{display:block;margin-left:auto;margin-right:auto;} +span.infoValue{color:#7a7a7a}table.extractSubgridTable td{padding-bottom:20px}table.extractSubgridTable input.sb{border:1px solid #808080;width:55px}.sliderX,.sliderY,.sliderZ{margin-left:11px;margin-right:11px;width:370px}button.cameraPreset{background:no-repeat 3px 3px;border:1px solid #aaa;height:32px;margin-right:10px;width:32px}button.plusX{background-image:url('../../images/pqXPlus24.png')}button.minusX{background-image:url('../../images/pqXMinus24.png')}button.plusY{background-image:url('../../images/pqYPlus24.png')}button.minusY{background-image:url('../../images/pqYMinus24.png')}button.plusZ{background-image:url('../../images/pqZPlus24.png')}button.minusZ{background-image:url('../../images/pqZMinus24.png')}button.cameraPreset:hover{background-color:#ada}div.sofBottomButtons{float:right;margin-top:15px}div.sofPointEdit{display:none;float:right;margin-top:10px}input.scalarValueEdit,input.opacityValueEdit{border:1px solid #808080;margin-left:5px;margin-right:10px;width:65px}.scmColorPicker{background:url('../../images/select2.png') -3px -3px;cursor:pointer;display:inline-block;height:30px;margin-left:5px;margin-top:-4px;position:absolute;width:30px}input.scmScalarValue{border:1px solid #808080;margin-left:5px;margin-right:15px;width:50px}div.rgbPointContainer{margin-bottom:10px;margin-top:10px}div.scmDivider{border-top:1px solid #d7d7d7}div.scmBottomButtons{float:right;padding-top:10px}button.scmDeletePoint{margin-left:48px;position:relative}table.objectList{border-collapse:collapse;width:100%}table.objectList th{background-color:#d0d0f6;border:1px solid #808080;padding-left:4px}table.objectList th.visibility{width:20px}table.objectList td{border:1px solid #808080;padding-left:2px}div.objectListBottomButtons{float:right;margin-top:10px}#loadingStatus{margin-left:10px}div.presetSelectionContainer{border-bottom:1px solid #d7d7d7;margin-bottom:10px;padding-bottom:6px;padding-top:8px}select.scmPresets{display:block;margin-left:auto;margin-right:auto} diff --git a/modules/ratings/public/css/item/item.ratings.css b/modules/ratings/public/css/item/item.ratings.css index 4eb5cd646..20c1fe8e7 100644 --- a/modules/ratings/public/css/item/item.ratings.css +++ b/modules/ratings/public/css/item/item.ratings.css @@ -1 +1 @@ -#ratingsAverage{float:left;width:200px;}#ratingsUser{float:right;width:200px;}div.ratingsVSpacer{height:30px;}span.averageStats{color:#676767;margin-left:7px;}span.addRating{color:#676767;float:left;margin-right:7px;}div.loginToRate{float:right;font-size:12px;padding-bottom:8px;}#registerToRate,#loginToRate{color:#56758b;font-weight:bold;text-decoration:none;}#registerToRate:hover,#loginToRate:hover{cursor:pointer;text-decoration:underline;} +#ratingsAverage{float:left;width:200px}#ratingsUser{float:right;width:200px}div.ratingsVSpacer{height:30px}span.averageStats{color:#676767;margin-left:7px}span.addRating{color:#676767;float:left;margin-right:7px}div.loginToRate{float:right;font-size:12px;padding-bottom:8px}#registerToRate,#loginToRate{color:#56758b;font-weight:bold;text-decoration:none}#registerToRate:hover,#loginToRate:hover{cursor:pointer;text-decoration:underline} diff --git a/modules/remoteprocessing/public/css/executable/executable.define.css b/modules/remoteprocessing/public/css/executable/executable.define.css index 162b30d2e..6cfd8f870 100644 --- a/modules/remoteprocessing/public/css/executable/executable.define.css +++ b/modules/remoteprocessing/public/css/executable/executable.define.css @@ -1 +1 @@ -#jsonMetadataContent{display:none;}.column{float:left;width:530px;}.portlet{margin:0 1em 1em 0;}.portlet-header{cursor:move;margin:0.3em;padding-bottom:4px;padding-left:0.2em;}.portlet-header .ui-icon{float:right;}.portlet-content{padding:0.4em;}.ui-sortable-placeholder{border:1px dotted #000;height:50px !important;visibility:visible !important;}.ui-sortable-placeholder *{visibility:hidden;}.deleteOptionLink{cursor:pointer !important;float:right;} +#jsonMetadataContent{display:none}.column{float:left;width:530px}.portlet{margin:0 1em 1em 0}.portlet-header{cursor:move;margin:0.3em;padding-bottom:4px;padding-left:0.2em}.portlet-header .ui-icon{float:right}.portlet-content{padding:0.4em}.ui-sortable-placeholder{border:1px dotted #000;height:50px !important;visibility:visible !important}.ui-sortable-placeholder *{visibility:hidden}.deleteOptionLink{cursor:pointer !important;float:right} diff --git a/modules/remoteprocessing/public/css/index/index.selectaction.css b/modules/remoteprocessing/public/css/index/index.selectaction.css index fd1abb0df..bb50cb693 100644 --- a/modules/remoteprocessing/public/css/index/index.selectaction.css +++ b/modules/remoteprocessing/public/css/index/index.selectaction.css @@ -1 +1 @@ -#selectactionBlock .blockSet{border-radius:10px;border:1px solid #ccc;cursor:pointer;float:left;margin:5px;padding:1px;width:262px;}#selectactionBlock .blockSet:hover{border:2px solid #d3e8f8;box-shadow:1px 2px 4px #b9b9b9;padding:0;}#seperatorSelectAction{background-color:#fff;background-image:-webkit-linear-gradient(top, #fff, #c4c4c4);background-image:linear-gradient(to bottom,#fff, #c4c4c4);border-radius:10px;box-shadow:1px 2px 4px #b9b9b9;height:5px;}#selectactionBlock h4{margin-bottom:2px;} +#selectactionBlock .blockSet{border:1px solid #ccc;border-radius:10px;cursor:pointer;float:left;margin:5px;padding:1px;width:262px}#selectactionBlock .blockSet:hover{border:2px solid #d3e8f8;box-shadow:1px 2px 4px #b9b9b9;padding:0}#seperatorSelectAction{background-color:#fff;background-image:-webkit-linear-gradient(top, #fff, #c4c4c4);background-image:linear-gradient(to bottom,#fff, #c4c4c4);border-radius:10px;box-shadow:1px 2px 4px #b9b9b9;height:5px}#selectactionBlock h4{margin-bottom:2px} diff --git a/modules/remoteprocessing/public/css/job/job.init.css b/modules/remoteprocessing/public/css/job/job.init.css index 8b38c7e6f..eac0b98fc 100644 --- a/modules/remoteprocessing/public/css/job/job.init.css +++ b/modules/remoteprocessing/public/css/job/job.init.css @@ -1 +1 @@ -.optionWrapper,.nameWrapper{border-radius:6px;border:#354856 1px solid;box-shadow:0 0 5px #666;margin-bottom:2px;padding:0 5px 6px 5px;}.optionWrapper h4,.nameWrapper h4{border-bottom:1px solid #808080;font-size:14px;margin-bottom:0;margin-top:2px;}#schedulerWrapper{border-radius:6px;border:#354856 1px solid;box-shadow:0 0 5px #666;margin-bottom:2px;}#uploadContentBlock .ui-widget-content{background:#f8f8f8 !important;}.reviewUploaded form,#wizard{display:none;}#uploadTabs{width:571px !important;}#browseExecutableFile a img{margin-right:2px;position:relative;top:2px;}#metaWrapper{display:none;}#metaWrapper .viewMain{width:95% !important;} +.optionWrapper,.nameWrapper{border:#354856 1px solid;border-radius:6px;box-shadow:0 0 5px #666;margin-bottom:2px;padding:0 5px 6px}.optionWrapper h4,.nameWrapper h4{border-bottom:1px solid #808080;font-size:14px;margin-bottom:0;margin-top:2px}#schedulerWrapper{border:#354856 1px solid;border-radius:6px;box-shadow:0 0 5px #666;margin-bottom:2px}#uploadContentBlock .ui-widget-content{background:#f8f8f8 !important}.reviewUploaded form,#wizard{display:none}#uploadTabs{width:571px !important}#browseExecutableFile a img{margin-right:2px;position:relative;top:2px}#metaWrapper{display:none}#metaWrapper .viewMain{width:95% !important} diff --git a/modules/remoteprocessing/public/css/job/job.manage.css b/modules/remoteprocessing/public/css/job/job.manage.css index 6ada153d1..bd6156fac 100644 --- a/modules/remoteprocessing/public/css/job/job.manage.css +++ b/modules/remoteprocessing/public/css/job/job.manage.css @@ -1 +1 @@ -.midasTree td{cursor:pointer !important;} +.midasTree td{cursor:pointer !important} diff --git a/modules/remoteprocessing/public/css/job/job.view.css b/modules/remoteprocessing/public/css/job/job.view.css index e15186f4d..03fb5dbeb 100644 --- a/modules/remoteprocessing/public/css/job/job.view.css +++ b/modules/remoteprocessing/public/css/job/job.view.css @@ -1 +1 @@ -div.viewWrapper{padding-right:40px !important;}table#tableResults,table#tableXml{width:100%;}.dataTables_wrapper{border:#354856 1px solid;border-radius:6px;box-shadow:0 0 5px #666;padding:5px 10px 25px 10px;}table#tableResults td{border-bottom:1px solid #808080;}#hiddenLog{border-radius:6px;border:#354856 1px solid;box-shadow:0 0 5px #666;display:none;height:400px;margin-bottom:2px;overflow:scroll;padding:0 5px 6px 5px;}#metricsWrapper{border-radius:6px;border:#354856 1px solid;box-shadow:0 0 5px #666;display:none;margin-bottom:2px;padding:0 5px 6px 5px;} +div.viewWrapper{padding-right:40px !important}table#tableResults,table#tableXml{width:100%}.dataTables_wrapper{border:#354856 1px solid;border-radius:6px;box-shadow:0 0 5px #666;padding:5px 10px 25px}table#tableResults td{border-bottom:1px solid #808080}#hiddenLog{border:#354856 1px solid;border-radius:6px;box-shadow:0 0 5px #666;display:none;height:400px;margin-bottom:2px;overflow:scroll;padding:0 5px 6px}#metricsWrapper{border:#354856 1px solid;border-radius:6px;box-shadow:0 0 5px #666;display:none;margin-bottom:2px;padding:0 5px 6px} diff --git a/modules/remoteprocessing/public/css/layout/remoteprocessing.css b/modules/remoteprocessing/public/css/layout/remoteprocessing.css index a7b97db87..e1fcce4c1 100644 --- a/modules/remoteprocessing/public/css/layout/remoteprocessing.css +++ b/modules/remoteprocessing/public/css/layout/remoteprocessing.css @@ -1 +1 @@ -div.HeaderAction ul li.processButton{background-color:#578dbb;background-image:-webkit-linear-gradient(top, #578dbb, #325372);background-image:linear-gradient(to bottom,#578dbb, #325372);}div.HeaderAction ul li.processButton:hover{background-color:#5b7ad2;background-image:-webkit-linear-gradient(top, #5b7ad2, #42779d);background-image:linear-gradient(to bottom,#5b7ad2, #42779d);} +div.HeaderAction ul li.processButton{background-color:#578dbb;background-image:-webkit-linear-gradient(top, #578dbb, #325372);background-image:linear-gradient(to bottom,#578dbb, #325372)}div.HeaderAction ul li.processButton:hover{background-color:#5b7ad2;background-image:-webkit-linear-gradient(top, #5b7ad2, #42779d);background-image:linear-gradient(to bottom,#5b7ad2, #42779d)} diff --git a/modules/sizequota/public/css/folder/folder.index.css b/modules/sizequota/public/css/folder/folder.index.css index 60ea6fbf0..368748ffc 100644 --- a/modules/sizequota/public/css/folder/folder.index.css +++ b/modules/sizequota/public/css/folder/folder.index.css @@ -1 +1 @@ -#hFreeSpaceValue{display:none;}#quotaValue{display:none;height:200px;width:400px;}#quotaChart{display:none;}#usedSpaceValue{display:none;} +#hFreeSpaceValue{display:none}#quotaValue{display:none;height:200px;width:400px}#quotaChart{display:none}#usedSpaceValue{display:none} diff --git a/modules/solr/public/css/admin/admin.index.css b/modules/solr/public/css/admin/admin.index.css index 2ea199ef2..7a0b8d0bf 100644 --- a/modules/solr/public/css/admin/admin.index.css +++ b/modules/solr/public/css/admin/admin.index.css @@ -1 +1 @@ -div.rebuildIndexContainer{margin-top:20px;}#rebuildIndexButton{margin:10px 0 10px 0 !important;}#rebuildProgressMessage{margin-top:5px;} +div.rebuildIndexContainer{margin-top:20px}#rebuildIndexButton{margin:10px 0 !important}#rebuildProgressMessage{margin-top:5px} diff --git a/modules/solr/public/css/advanced/advanced.index.css b/modules/solr/public/css/advanced/advanced.index.css index 22b551768..4c4a8bb71 100644 --- a/modules/solr/public/css/advanced/advanced.index.css +++ b/modules/solr/public/css/advanced/advanced.index.css @@ -1 +1 @@ -div.viewWrapper{padding-right:30px !important;}div.queryArea{margin-top:10px;}div.topText{margin-top:8px;}#advancedQueryField{height:36px;max-width:800px;width:600px;}#advancedSearchButton{margin-left:0 !important;padding:4px 13px 4px 13px;}#resultsArea{border-top:1px solid #d0d0d0;margin-top:10px;width:100%;}img.resultsLoading{margin-top:10px;}div.itemResult{border-bottom:1px dotted #bbb;padding-bottom:10px;padding-top:10px;}div.pageItrButtons{float:right;margin-top:15px;} +div.viewWrapper{padding-right:30px !important}div.queryArea{margin-top:10px}div.topText{margin-top:8px}#advancedQueryField{height:36px;max-width:800px;width:600px}#advancedSearchButton{margin-left:0 !important;padding:4px 13px}#resultsArea{border-top:1px solid #d0d0d0;margin-top:10px;width:100%}img.resultsLoading{margin-top:10px}div.itemResult{border-bottom:1px dotted #bbb;padding-bottom:10px;padding-top:10px}div.pageItrButtons{float:right;margin-top:15px} diff --git a/modules/statistics/public/css/index/index.index.css b/modules/statistics/public/css/index/index.index.css index 63b7625c2..7edaa46c0 100644 --- a/modules/statistics/public/css/index/index.index.css +++ b/modules/statistics/public/css/index/index.index.css @@ -1 +1 @@ -div.viewSideBar input.globalButton{margin-left:0 !important;}div.viewWrapper{padding-right:40px !important;} +div.viewSideBar input.globalButton{margin-left:0 !important}div.viewWrapper{padding-right:40px !important} diff --git a/modules/statistics/public/css/item/item.index.css b/modules/statistics/public/css/item/item.index.css index 8b664edf9..6d4d20162 100644 --- a/modules/statistics/public/css/item/item.index.css +++ b/modules/statistics/public/css/item/item.index.css @@ -1 +1 @@ -div.viewSideBar input.globalButton{margin-left:0 !important;}div.viewWrapper{padding-right:40px !important;}input.dateSelect{background:#fff url(../../images/calendar.png) no-repeat scroll 2px 0;border:1px solid #808080;padding-left:20px;}#downloadResultLimit{border:1px solid #808080;width:80px;}#logFilterForm{border-bottom:1px solid #a7a7a7;margin-bottom:6px;padding-bottom:5px;}input.filterButton{background:#f6f9fe;-moz-box-align:center;-webkit-box-align:center;border:1px solid #808080;box-sizing:border-box;color:#2e6e9e;cursor:pointer;font-weight:bold;line-height:1.4;margin-right:0.1em;overflow:visible;position:relative;text-align:center;text-decoration:none !important;zoom:1;}input.filterButton:hover{background:#cbd9e3 none;color:#1d5987;text-decoration:none;}input.filterButton[disabled]{background:#dbdbdb none;color:#808080;cursor:default;text-decoration:none;}img#loadingStatistics{display:none;margin-left:10px;}span.headerSmall{color:#959595;font-weight:lighter;}span#filteredCount{display:inline-block;padding-top:5px;} +div.viewSideBar input.globalButton{margin-left:0 !important}div.viewWrapper{padding-right:40px !important}input.dateSelect{background:#fff url('../../images/calendar.png') no-repeat scroll 2px 0;border:1px solid #808080;padding-left:20px}#downloadResultLimit{border:1px solid #808080;width:80px}#logFilterForm{border-bottom:1px solid #a7a7a7;margin-bottom:6px;padding-bottom:5px}input.filterButton{background:#f6f9fe;border:1px solid #808080;-moz-box-align:center;-webkit-box-align:center;box-sizing:border-box;color:#2e6e9e;cursor:pointer;font-weight:bold;line-height:1.4;margin-right:0.1em;overflow:visible;position:relative;text-align:center;text-decoration:none !important;zoom:1}input.filterButton:hover{background:#cbd9e3 none;color:#1d5987;text-decoration:none}input.filterButton[disabled]{background:#dbdbdb none;color:#808080;cursor:default;text-decoration:none}img#loadingStatistics{display:none;margin-left:10px}span.headerSmall{color:#959595;font-weight:lighter}span#filteredCount{display:inline-block;padding-top:5px} diff --git a/modules/thumbnailcreator/public/css/item/thumbnailcreator.item.view.css b/modules/thumbnailcreator/public/css/item/thumbnailcreator.item.view.css index 70bc5f9fb..fa5c94dfa 100644 --- a/modules/thumbnailcreator/public/css/item/thumbnailcreator.item.view.css +++ b/modules/thumbnailcreator/public/css/item/thumbnailcreator.item.view.css @@ -1 +1 @@ -img.makeThumbnailIcon{cursor:pointer;float:right;padding-left:2px;padding-right:2px;}img.largeImage{padding-top:10px;} +img.makeThumbnailIcon{cursor:pointer;float:right;padding-left:2px;padding-right:2px}img.largeImage{padding-top:10px} diff --git a/modules/tracker/public/css/producer/producer.edit.css b/modules/tracker/public/css/producer/producer.edit.css index 0d6f0a8bd..c3b5f7980 100644 --- a/modules/tracker/public/css/producer/producer.edit.css +++ b/modules/tracker/public/css/producer/producer.edit.css @@ -1 +1 @@ -div.submitButtonContainer{float:right;margin-top:20px;}textarea.description{resize:none;} +div.submitButtonContainer{float:right;margin-top:20px}textarea.description{resize:none} diff --git a/modules/tracker/public/css/producer/producer.list.css b/modules/tracker/public/css/producer/producer.list.css index 8b24a8f57..a66b66d05 100644 --- a/modules/tracker/public/css/producer/producer.list.css +++ b/modules/tracker/public/css/producer/producer.list.css @@ -1 +1 @@ -div.introText{margin-bottom:20px;}div.producerList a.producerLink{font-size:18px;font-weight:bold;text-decoration:none;}div.producerList a.producerLink:hover{text-decoration:underline;}div.noProducers{font-style:italic;}div.producerDescription{margin-top:6px;}div.producerContainer{border-top:1px solid #d7d7d7;margin-top:20px;padding-top:8px;}div.createProducerContainer{border-top:1px solid #d7d7d7;margin-top:20px;padding-top:10px;}form.createProducer input[type=text]{width:300px;}form.createProducer textarea{resize:none;width:298px;} +div.introText{margin-bottom:20px}div.producerList a.producerLink{font-size:18px;font-weight:bold;text-decoration:none}div.producerList a.producerLink:hover{text-decoration:underline}div.noProducers{font-style:italic}div.producerDescription{margin-top:6px}div.producerContainer{border-top:1px solid #d7d7d7;margin-top:20px;padding-top:8px}div.createProducerContainer{border-top:1px solid #d7d7d7;margin-top:20px;padding-top:10px}form.createProducer input[type=text]{width:300px}form.createProducer textarea{resize:none;width:298px} diff --git a/modules/tracker/public/css/producer/producer.view.css b/modules/tracker/public/css/producer/producer.view.css index 83affd453..6ef8c0973 100644 --- a/modules/tracker/public/css/producer/producer.view.css +++ b/modules/tracker/public/css/producer/producer.view.css @@ -1 +1 @@ -div.producerInfoContainer{border-bottom:1px solid #d7d7d7;margin-bottom:6px;padding-bottom:4px}div.producerData,div.datasetHeader{color:#777;margin-bottom:6px}div.sectionTitle{color:#707070;font-size:18px;margin-bottom:8px}div.trendGroupContainer{border-radius:5px;border:1px solid #a7a7a7;margin-bottom:15px;padding:6px}div.headerSeparator{background-color:#d7d7d7;height:1px;margin-bottom:5px;margin-top:8px;width:100%}div.trendContainer{color:#56758b;font-size:14px;margin-bottom:2px}div.trendContainer input[type="checkbox"]{position:relative;top:1px}a.trendLink{color:#56758b !important;display:inline-block;font-weight:bold !important;padding-bottom:3px;padding-left:3px;padding-top:3px;width:90%}a.trendLink:hover{background-color:#e5e5e5;color:#16354b;text-decoration:none !important}input.selectTrend{display:inline}.keyMetric{float:right} +div.producerInfoContainer{border-bottom:1px solid #d7d7d7;margin-bottom:6px;padding-bottom:4px}div.producerData,div.datasetHeader{color:#777;margin-bottom:6px}div.sectionTitle{color:#707070;font-size:18px;margin-bottom:8px}div.trendGroupContainer{border:1px solid #a7a7a7;border-radius:5px;margin-bottom:15px;padding:6px}div.headerSeparator{background-color:#d7d7d7;height:1px;margin-bottom:5px;margin-top:8px;width:100%}div.trendContainer{color:#56758b;font-size:14px;margin-bottom:2px}div.trendContainer input[type='checkbox']{position:relative;top:1px}a.trendLink{color:#56758b !important;display:inline-block;font-weight:bold !important;padding-bottom:3px;padding-left:3px;padding-top:3px;width:90%}a.trendLink:hover{background-color:#e5e5e5;color:#16354b;text-decoration:none !important}input.selectTrend{display:inline}.keyMetric{float:right} diff --git a/modules/tracker/public/css/trend/trend.edit.css b/modules/tracker/public/css/trend/trend.edit.css index 3ff13180f..535d8adfa 100644 --- a/modules/tracker/public/css/trend/trend.edit.css +++ b/modules/tracker/public/css/trend/trend.edit.css @@ -1 +1 @@ -div.formWrapper{padding-left:15px;width:840px;}div.editTitle{color:#797979;font-size:16px;margin-bottom:12px;margin-top:8px;}div.submitButtonContainer{margin-top:25px;}div.formRow{margin-bottom:6px;}span.noItem{color:#a0a0a0;font-style:italic;}input.selectItem,input.removeItem{margin-left:8px !important;} +div.formWrapper{padding-left:15px;width:840px}div.editTitle{color:#797979;font-size:16px;margin-bottom:12px;margin-top:8px}div.submitButtonContainer{margin-top:25px}div.formRow{margin-bottom:6px}span.noItem{color:#a0a0a0;font-style:italic}input.selectItem,input.removeItem{margin-left:8px !important} diff --git a/modules/tracker/public/css/trend/trend.notify.css b/modules/tracker/public/css/trend/trend.notify.css index ca94cb57b..71e2c0993 100644 --- a/modules/tracker/public/css/trend/trend.notify.css +++ b/modules/tracker/public/css/trend/trend.notify.css @@ -1 +1 @@ -div.thresholdInfoContainer{margin-top:10px;}input.thresholdValue{width:70px !important;}div.bottomButtons{float:right;margin-top:15px;}div.registeredEmail{color:#797979;margin-top:10px;} +div.thresholdInfoContainer{margin-top:10px}input.thresholdValue{width:70px !important}div.bottomButtons{float:right;margin-top:15px}div.registeredEmail{color:#797979;margin-top:10px} diff --git a/modules/tracker/public/css/trend/trend.view.css b/modules/tracker/public/css/trend/trend.view.css index 56ba162c1..54ae46c41 100644 --- a/modules/tracker/public/css/trend/trend.view.css +++ b/modules/tracker/public/css/trend/trend.view.css @@ -1 +1 @@ -div.itemsContainer{margin-bottom:10px;margin-top:6px;}div.dateControlContainer{border-bottom:1px solid #d7d7d7;margin-bottom:8px;padding-bottom:4px;}input.dateSelect{background:#fff url(../../images/calendar.png) no-repeat scroll 2px 1px;border:1px solid #808080;box-sizing:border-box;height:20px;padding-left:20px;width:120px;}.branchfilter{border:1px solid #808080;box-sizing:border-box;height:20px;}#filterButton,#branchFilterButton{margin-left:2px !important;}div.chartContainer{height:360px;width:100%;}span.infoItem{color:#979797;}span.itemLinkNone{color:#a5a5a5;font-style:italic;}span.noPoints{color:#909090;display:inline-block;margin-top:10px;}.yMin,.yMax,.y2Min,.y2Max{margin-left:10px;margin-right:10px;width:70px;}div.bottomButtons{float:right;margin-top:15px;}div.deleteProgressBar{margin-bottom:6px;margin-top:10px;}div.bottomButtonsDelete{float:right;margin-top:20px;}input.deleteYes,input.deleteNo{margin-left:10px !important;}div.belowChartText{color:#707070;font-style:italic;margin-top:20px;}span.redText{color:#f00;font-weight:bold;}div.toggleUnofficialIcon{border-radius:50%;box-sizing:border-box;display:inline-block;height:16px;position:relative;top:2px;width:16px;}div.toggleUnofficialIcon.toHide{border:1px dashed #f22;}div.toggleUnofficialIcon.toShow{background-color:#f22;}button.add-branchfilter{margin-left:15px;background-color:#6263aa;color:#fff;font-weight:bold;border:none;border-radius:2px;padding:4px 11px;cursor:pointer;}button.add-branchfilter:hover{background-color:#525399;}.otherBranchFilter{margin:5px 0;}a.removeBranchFilter{margin-left:10px;} +div.itemsContainer{margin-bottom:10px;margin-top:6px}div.dateControlContainer{border-bottom:1px solid #d7d7d7;margin-bottom:8px;padding-bottom:4px}input.dateSelect{background:#fff url('../../images/calendar.png') no-repeat scroll 2px 1px;border:1px solid #808080;box-sizing:border-box;height:20px;padding-left:20px;width:120px}.branchfilter{border:1px solid #808080;box-sizing:border-box;height:20px}#filterButton,#branchFilterButton{margin-left:2px !important}div.chartContainer{height:360px;width:100%}span.infoItem{color:#979797}span.itemLinkNone{color:#a5a5a5;font-style:italic}span.noPoints{color:#909090;display:inline-block;margin-top:10px}.yMin,.yMax,.y2Min,.y2Max{margin-left:10px;margin-right:10px;width:70px}div.bottomButtons{float:right;margin-top:15px}div.deleteProgressBar{margin-bottom:6px;margin-top:10px}div.bottomButtonsDelete{float:right;margin-top:20px}input.deleteYes,input.deleteNo{margin-left:10px !important}div.belowChartText{color:#707070;font-style:italic;margin-top:20px}span.redText{color:#f00;font-weight:bold}div.toggleUnofficialIcon{border-radius:50%;box-sizing:border-box;display:inline-block;height:16px;position:relative;top:2px;width:16px}div.toggleUnofficialIcon.toHide{border:1px dashed #f22}div.toggleUnofficialIcon.toShow{background-color:#f22}button.add-branchfilter{background-color:#6263aa;border:0;border-radius:2px;color:#fff;cursor:pointer;font-weight:bold;margin-left:15px;padding:4px 11px}button.add-branchfilter:hover{background-color:#525399}.otherBranchFilter{margin:5px 0}a.removeBranchFilter{margin-left:10px} diff --git a/modules/validation/public/css/validation.index.css b/modules/validation/public/css/validation.index.css index 5747f4ebf..48823d8ec 100644 --- a/modules/validation/public/css/validation.index.css +++ b/modules/validation/public/css/validation.index.css @@ -1 +1 @@ -div.viewMain h3{margin-top:2px;padding-top:0;}div.dashEntry{border-top:1px solid #dad8d4;cursor:pointer;padding-bottom:10px;padding-top:10px;}div.grayEntry{background-color:#eee;}.dashDescription{color:#999;font-size:11px;margin-left:2ex;text-shadow:#fff 0 1px 1px;vertical-align:middle;}.dashTitle{font-size:13px;margin-bottom:0.67em;margin-top:0.67em;padding-left:2ex;text-shadow:#fff 0 1px 1px;vertical-align:middle;}div.dashPanel{border-top:1px solid #dad8d4;padding-top:2ex;}.dashIcon{float:left;}.dashButton{border:1px dotted #999;margin-right:2px;padding:6px 1px 2px;}.dashButton:hover{background-color:#eee;border:1px dotted #999;cursor:pointer;margin-right:2px;padding:6px 1px 2px;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;}.dashButton:active{background-color:#aaa;border:1px dotted #999;cursor:pointer;margin-right:2px;padding:6px 1px 2px;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;}.dashDeleteIcon{float:right;} +div.viewMain h3{margin-top:2px;padding-top:0}div.dashEntry{border-top:1px solid #dad8d4;cursor:pointer;padding-bottom:10px;padding-top:10px}div.grayEntry{background-color:#eee}.dashDescription{color:#999;font-size:11px;margin-left:2ex;text-shadow:#fff 0 1px 1px;vertical-align:middle}.dashTitle{font-size:13px;margin-bottom:0.67em;margin-top:0.67em;padding-left:2ex;text-shadow:#fff 0 1px 1px;vertical-align:middle}div.dashPanel{border-top:1px solid #dad8d4;padding-top:2ex}.dashIcon{float:left}.dashButton{border:1px dotted #999;margin-right:2px;padding:6px 1px 2px}.dashButton:hover{-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;background-color:#eee;border:1px dotted #999;cursor:pointer;margin-right:2px;padding:6px 1px 2px}.dashButton:active{-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;background-color:#aaa;border:1px dotted #999;cursor:pointer;margin-right:2px;padding:6px 1px 2px}.dashDeleteIcon{float:right} diff --git a/modules/visualize/public/css/media/media.index.css b/modules/visualize/public/css/media/media.index.css index 5e1580988..24ee379f2 100644 --- a/modules/visualize/public/css/media/media.index.css +++ b/modules/visualize/public/css/media/media.index.css @@ -1 +1 @@ -div.helpContent{background-color:#ddd;display:none;font-size:10px;margin-bottom:5px;margin-top:5px;}li.methodListElement{margin-bottom:3px;}img.toolButton{cursor:pointer;position:absolute;top:5px;z-index:100;}#renderercontainer{bottom:0;display:none;left:0;overflow:hidden;position:absolute;right:0;top:-30px;z-index:2;}img.visuLoading{left:20px;position:absolute;top:30px;z-index:100;}#renderer-type{position:absolute;right:60px;top:8px;width:100px;z-index:5;}#controlPanel{bottom:0;display:none;left:0;overflow:hidden;position:absolute;top:40px;width:200px;z-index:1;} +div.helpContent{background-color:#ddd;display:none;font-size:10px;margin-bottom:5px;margin-top:5px}li.methodListElement{margin-bottom:3px}img.toolButton{cursor:pointer;position:absolute;top:5px;z-index:100}#renderercontainer{bottom:0;display:none;left:0;overflow:hidden;position:absolute;right:0;top:-30px;z-index:2}img.visuLoading{left:20px;position:absolute;top:30px;z-index:100}#renderer-type{position:absolute;right:60px;top:8px;width:100px;z-index:5}#controlPanel{bottom:0;display:none;left:0;overflow:hidden;position:absolute;top:40px;width:200px;z-index:1} diff --git a/modules/visualize/public/css/paraview/paraview.dual.css b/modules/visualize/public/css/paraview/paraview.dual.css index 4e5075ce2..05e73224e 100644 --- a/modules/visualize/public/css/paraview/paraview.dual.css +++ b/modules/visualize/public/css/paraview/paraview.dual.css @@ -1 +1 @@ -div.rendererWrapper{position:relative;}#leftRenderer{height:425px;overflow:hidden;position:absolute;width:424px;z-index:2;}#rightRenderer{height:425px;left:425px;overflow:hidden;position:absolute;width:425px;z-index:2;}img.leftLoading,img.rightLoading{margin-left:10px;margin-top:10px;z-index:100;}#leftRendererOverlay,#rightRendererOverlay{position:absolute;right:3px;top:3px;z-index:5;}div.slidersContainer{position:relative;top:426px;}div.sliceControlContainer{position:absolute;width:424px;}div.windowControlContainer{left:425px;position:absolute;width:424px;}#windowSlider,#sliceSlider{margin:8px 14px 8px 15px;}#windowInfo,#sliceInfo{margin-left:15px;}button.actionButton{background:no-repeat 2px 1px;height:25px;margin-right:10px;margin-top:10px;width:25px;}button.actionActive{background-color:#9c9;}button.actionInactive{background-color:#ccc;}button.pointSelectButton{background-image:url(../../images/pointSelect.png);}button.pointMapListButton{background-image:url(../../images/pqNodeSetData16.png);}button.cameraLinkButton{background-image:url(../../images/camera_link.png);}#leftLoadingStatus,#rightLoadingStatus{margin-left:10px;}span.infoValue{color:#7a7a7a;}.pointListTable{border-collapse:collapse;width:100%;}.pointListTable th{background-color:#cdd;border:1px solid #a0a0a0;padding:5px 3px 5px 5px;}.pointListTable tbody tr{border-bottom:1px dotted #a0a0a0;}div.colorSwatchL,div.colorSwatchR{border:1px solid #707070;display:inline-block;height:14px;margin-right:4px;position:relative;top:3px;width:14px;}button.highlightPoints,button.deletePoints,button.processButton,button.closeButton{background-color:#f0f0f0;border-radius:1px;border:1px solid #b0b0b0;padding:3px 6px 3px 6px;}button.highlightPoints:hover,button.deletePoints:hover,button.processButton:hover,button.closeButton:hover{background-color:#dadada;border:1px solid #808080;}button.highlightOn{background-color:#cdf9cd !important;border-radius:2px;border:1px solid #b0b0b0;}div.bottomButtons{float:right;margin-top:15px;}td.pointMapActions{float:right;} +div.rendererWrapper{position:relative}#leftRenderer{height:425px;overflow:hidden;position:absolute;width:424px;z-index:2}#rightRenderer{height:425px;left:425px;overflow:hidden;position:absolute;width:425px;z-index:2}img.leftLoading,img.rightLoading{margin-left:10px;margin-top:10px;z-index:100}#leftRendererOverlay,#rightRendererOverlay{position:absolute;right:3px;top:3px;z-index:5}div.slidersContainer{position:relative;top:426px}div.sliceControlContainer{position:absolute;width:424px}div.windowControlContainer{left:425px;position:absolute;width:424px}#windowSlider,#sliceSlider{margin:8px 14px 8px 15px}#windowInfo,#sliceInfo{margin-left:15px}button.actionButton{background:no-repeat 2px 1px;height:25px;margin-right:10px;margin-top:10px;width:25px}button.actionActive{background-color:#9c9}button.actionInactive{background-color:#ccc}button.pointSelectButton{background-image:url('../../images/pointSelect.png')}button.pointMapListButton{background-image:url('../../images/pqNodeSetData16.png')}button.cameraLinkButton{background-image:url('../../images/camera_link.png')}#leftLoadingStatus,#rightLoadingStatus{margin-left:10px}span.infoValue{color:#7a7a7a}.pointListTable{border-collapse:collapse;width:100%}.pointListTable th{background-color:#cdd;border:1px solid #a0a0a0;padding:5px 3px 5px 5px}.pointListTable tbody tr{border-bottom:1px dotted #a0a0a0}div.colorSwatchL,div.colorSwatchR{border:1px solid #707070;display:inline-block;height:14px;margin-right:4px;position:relative;top:3px;width:14px}button.highlightPoints,button.deletePoints,button.processButton,button.closeButton{background-color:#f0f0f0;border:1px solid #b0b0b0;border-radius:1px;padding:3px 6px}button.highlightPoints:hover,button.deletePoints:hover,button.processButton:hover,button.closeButton:hover{background-color:#dadada;border:1px solid #808080}button.highlightOn{background-color:#cdf9cd !important;border:1px solid #b0b0b0;border-radius:2px}div.bottomButtons{float:right;margin-top:15px}td.pointMapActions{float:right} diff --git a/modules/visualize/public/css/paraview/paraview.slice.css b/modules/visualize/public/css/paraview/paraview.slice.css index 49c1ed5d1..d7c2f17f7 100644 --- a/modules/visualize/public/css/paraview/paraview.slice.css +++ b/modules/visualize/public/css/paraview/paraview.slice.css @@ -1 +1 @@ -#sliceSlider,#windowLevelSlider{margin:8px 14px 8px 10px;width:551px;}#sliceInfo,#windowLevelInfo{color:#fff;margin-left:10px;z-index:3;}#renderercontainer{display:none;height:575px;overflow:hidden;position:relative;width:575px;z-index:2;}img.visuLoading{margin-left:10px;margin-top:10px;z-index:100;}#rendererOverlay{position:absolute;right:15px;top:40px;z-index:5;}#sliceControlContainer{position:absolute;top:5px;z-index:5;}#windowLevelControlContainer{bottom:5px;position:absolute;z-index:5;}button.actionButton{background:no-repeat 2px 1px;height:25px;width:25px;}button.actionActive{background-color:#9c9;}button.actionInactive{background-color:#ccc;}button.pointSelectButton{background-image:url(../../images/pointSelect.png);}#loadingStatus{margin-left:10px;}span.infoValue{color:#7a7a7a;} +#sliceSlider,#windowLevelSlider{margin:8px 14px 8px 10px;width:551px}#sliceInfo,#windowLevelInfo{color:#fff;margin-left:10px;z-index:3}#renderercontainer{display:none;height:575px;overflow:hidden;position:relative;width:575px;z-index:2}img.visuLoading{margin-left:10px;margin-top:10px;z-index:100}#rendererOverlay{position:absolute;right:15px;top:40px;z-index:5}#sliceControlContainer{position:absolute;top:5px;z-index:5}#windowLevelControlContainer{bottom:5px;position:absolute;z-index:5}button.actionButton{background:no-repeat 2px 1px;height:25px;width:25px}button.actionActive{background-color:#9c9}button.actionInactive{background-color:#ccc}button.pointSelectButton{background-image:url('../../images/pointSelect.png')}#loadingStatus{margin-left:10px}span.infoValue{color:#7a7a7a} diff --git a/modules/visualize/public/css/paraview/paraview.surface.css b/modules/visualize/public/css/paraview/paraview.surface.css index 16d5cfa82..f2566d20f 100644 --- a/modules/visualize/public/css/paraview/paraview.surface.css +++ b/modules/visualize/public/css/paraview/paraview.surface.css @@ -1 +1 @@ -#renderercontainer{display:none;height:575px;overflow:hidden;position:relative;width:575px;z-index:2;}#renderer-type{position:absolute;right:60px;top:8px;width:100px;z-index:5;}#loadingStatus{margin-left:10px;}span.infoValue{color:#7a7a7a;}#rendererSelect{width:100%;} +#renderercontainer{display:none;height:575px;overflow:hidden;position:relative;width:575px;z-index:2}#renderer-type{position:absolute;right:60px;top:8px;width:100px;z-index:5}#loadingStatus{margin-left:10px}span.infoValue{color:#7a7a7a}#rendererSelect{width:100%} diff --git a/modules/visualize/public/css/paraview/paraview.volume.css b/modules/visualize/public/css/paraview/paraview.volume.css index 5fbfefe63..034d26219 100644 --- a/modules/visualize/public/css/paraview/paraview.volume.css +++ b/modules/visualize/public/css/paraview/paraview.volume.css @@ -1 +1 @@ -#renderercontainer{display:none;height:575px;overflow:hidden;position:relative;width:575px;z-index:2;}img.visuLoading{margin-left:10px;margin-top:10px;z-index:100;}#rendererOverlay{position:absolute;right:15px;top:15px;z-index:5;}span.infoValue{color:#7a7a7a;}table.extractSubgridTable td{padding-bottom:20px;}table.extractSubgridTable input.sb{border:1px solid #808080;width:55px;}.sliderX,.sliderY,.sliderZ{margin-left:11px;margin-right:11px;width:370px;}button.cameraPreset{background:no-repeat 3px 3px;border:1px solid #aaa;height:32px;margin-right:10px;width:32px;}button.plusX{background-image:url(../../images/pqXPlus24.png);}button.minusX{background-image:url(../../images/pqXMinus24.png);}button.plusY{background-image:url(../../images/pqYPlus24.png);}button.minusY{background-image:url(../../images/pqYMinus24.png);}button.plusZ{background-image:url(../../images/pqZPlus24.png);}button.minusZ{background-image:url(../../images/pqZMinus24.png);}button.cameraPreset:hover{background-color:#ada;}div.sofBottomButtons{float:right;margin-top:15px;}div.sofPointEdit{display:none;margin-top:10px;float:right;}input.scalarValueEdit,input.opacityValueEdit{border:1px solid #808080;margin-left:5px;margin-right:10px;width:65px;}.scmColorPicker{background:url(../../images/select2.png) -3px -3px;cursor:pointer;display:inline-block;height:30px;margin-left:5px;margin-top:-4px;position:absolute;width:30px;}input.scmScalarValue{border:1px solid #808080;margin-left:5px;margin-right:15px;width:50px;}div.rgbPointContainer{margin-bottom:10px;margin-top:10px;}div.scmDivider{border-top:1px solid #d7d7d7;}div.scmBottomButtons{float:right;padding-top:10px;}button.scmDeletePoint{margin-left:48px;position:relative;}table.objectList{border-collapse:collapse;width:100%;}table.objectList th{background-color:#d0d0f6;border:1px solid #808080;padding-left:4px;}table.objectList th.visibility{width:20px;}table.objectList td{border:1px solid #808080;padding-left:2px;}div.objectListBottomButtons{float:right;margin-top:10px;}#loadingStatus{margin-left:10px;} +#renderercontainer{display:none;height:575px;overflow:hidden;position:relative;width:575px;z-index:2}img.visuLoading{margin-left:10px;margin-top:10px;z-index:100}#rendererOverlay{position:absolute;right:15px;top:15px;z-index:5}span.infoValue{color:#7a7a7a}table.extractSubgridTable td{padding-bottom:20px}table.extractSubgridTable input.sb{border:1px solid #808080;width:55px}.sliderX,.sliderY,.sliderZ{margin-left:11px;margin-right:11px;width:370px}button.cameraPreset{background:no-repeat 3px 3px;border:1px solid #aaa;height:32px;margin-right:10px;width:32px}button.plusX{background-image:url('../../images/pqXPlus24.png')}button.minusX{background-image:url('../../images/pqXMinus24.png')}button.plusY{background-image:url('../../images/pqYPlus24.png')}button.minusY{background-image:url('../../images/pqYMinus24.png')}button.plusZ{background-image:url('../../images/pqZPlus24.png')}button.minusZ{background-image:url('../../images/pqZMinus24.png')}button.cameraPreset:hover{background-color:#ada}div.sofBottomButtons{float:right;margin-top:15px}div.sofPointEdit{display:none;float:right;margin-top:10px}input.scalarValueEdit,input.opacityValueEdit{border:1px solid #808080;margin-left:5px;margin-right:10px;width:65px}.scmColorPicker{background:url('../../images/select2.png') -3px -3px;cursor:pointer;display:inline-block;height:30px;margin-left:5px;margin-top:-4px;position:absolute;width:30px}input.scmScalarValue{border:1px solid #808080;margin-left:5px;margin-right:15px;width:50px}div.rgbPointContainer{margin-bottom:10px;margin-top:10px}div.scmDivider{border-top:1px solid #d7d7d7}div.scmBottomButtons{float:right;padding-top:10px}button.scmDeletePoint{margin-left:48px;position:relative}table.objectList{border-collapse:collapse;width:100%}table.objectList th{background-color:#d0d0f6;border:1px solid #808080;padding-left:4px}table.objectList th.visibility{width:20px}table.objectList td{border:1px solid #808080;padding-left:2px}div.objectListBottomButtons{float:right;margin-top:10px}#loadingStatus{margin-left:10px} diff --git a/modules/visualize/public/css/webgl/webgl.index.css b/modules/visualize/public/css/webgl/webgl.index.css index ac0e7349f..66533a7b5 100644 --- a/modules/visualize/public/css/webgl/webgl.index.css +++ b/modules/visualize/public/css/webgl/webgl.index.css @@ -1 +1 @@ -body{background-color:#369;background-image:-webkit-linear-gradient(top, #369, #72b9ff);background-image:linear-gradient(to bottom,#369, #72b9ff);color:#eee;padding:0;margin:0;font-weight:bold;overflow:hidden;font-family:"Bitstream Vera Sans Mono", Consolas, Courier, monospace;font-size:13px;text-align:center;}#info{position:absolute;bottom:0;width:100%;padding:5px;z-index:100;}#onliver{position:absolute;top:70px;width:100%;padding:5px;z-index:100;color:#fff;}#helpDialog1{text-align:left;}a,b{color:#008000;}button.buttonNav{height:20px !important;width:20px !important;position:absolute !important;box-shadow:0 0 15px #666;border-image:initial;}button#buttonUp{left:50px;top:100px;}button#buttonDown{left:50px;top:150px;}button#buttonLeft{left:25px;top:125px;}button#buttonRight{left:75px;top:125px;}button#buttonReset{left:50px;top:125px;}button#buttonPlus{left:50px;top:180px;}button#buttonMinus{left:50px;top:205px;}div#axesContainer{position:absolute;bottom:0;} +body{background-color:#369;background-image:-webkit-linear-gradient(top, #369, #72b9ff);background-image:linear-gradient(to bottom,#369, #72b9ff);color:#eee;font-family:"Bitstream Vera Sans Mono", Consolas, Courier, monospace;font-size:13px;font-weight:bold;margin:0;overflow:hidden;padding:0;text-align:center}#info{bottom:0;padding:5px;position:absolute;width:100%;z-index:100}#onliver{color:#fff;padding:5px;position:absolute;top:70px;width:100%;z-index:100}#helpDialog1{text-align:left}a,b{color:#008000}button.buttonNav{border-image:initial;box-shadow:0 0 15px #666;height:20px !important;position:absolute !important;width:20px !important}button#buttonUp{left:50px;top:100px}button#buttonDown{left:50px;top:150px}button#buttonLeft{left:25px;top:125px}button#buttonRight{left:75px;top:125px}button#buttonReset{left:50px;top:125px}button#buttonPlus{left:50px;top:180px}button#buttonMinus{left:50px;top:205px}div#axesContainer{bottom:0;position:absolute}