diff --git a/CHANGES.md b/CHANGES.md index 6c7eaead..e439c254 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -35,6 +35,7 @@ * Removed superfish-1.4.8.js and supersubs-0.2b.js as they no longer break provider sorting with qtip removed and is no longer required due to new UI * Overhaul Config Search Settings in line with General Configuration * Fixes errors occurring when a show folder is deleted outside of SickRage +* Added confirmation dialogs back in that were missed due to new UI changes ### 0.2.1 (2014-10-22 06:41:00 UTC) diff --git a/gui/slick/css/dark.css b/gui/slick/css/dark.css index acc831b6..5ab86223 100644 --- a/gui/slick/css/dark.css +++ b/gui/slick/css/dark.css @@ -2958,4 +2958,99 @@ div.token-input-dropdown ul li.token-input-selected-dropdown-item { span.token-input-delete-token { margin: 0 1px; +} + +/* ======================================================================= +jquery.confirm.css +========================================================================== */ + +#confirmOverlay{ + width: 100%; + height: 100%; + position: fixed; + top: 0; + left: 0; + background: url('../images/bg.gif'); + background: -moz-linear-gradient(rgba(0,0,0,0.5), rgba(0,0,0,0.5)) repeat-x rgba(0,0,0,0.5); + background:-webkit-gradient(linear, 0% 0%, 0% 100%, from(rgba(0,0,0,0.5)), to(rgba(0,0,0,0.5))) repeat-x rgba(0,0,0,0.5); + z-index: 100000; +} + +#confirmBox{ + background: #222; + width: 460px; + position: fixed; + left: 50%; + top: 50%; + margin: -130px 0 0 -230px; + border: 1px solid #111; + box-shadow: 0px 0px 12px 0px rgba(0, 0, 0, 0.175); +} + +#confirmBox h1, +#confirmBox p{ + padding: 6px 10px; +} + +#confirmBox h1 { + background-color: #15528F; + border-bottom: 1px solid #111; + color: #fff; + margin: 0; + font-size: 22px; + text-shadow: 0px 1px 1px rgba(0, 0, 0, 0.75); +} + +#confirmBox p { + padding-top: 20px; + color: #fff; + text-shadow: 0px 1px 1px rgba(0, 0, 0, 0.75); +} + +#confirmButtons { + padding: 15px 0; + text-align: center; +} + +#confirmBox .button { + margin-right: 15px; + padding: 2px 20px; + text-decoration: none; + display: inline-block; + color: #fff; + text-align:center; + text-shadow: 0px 1px 1px rgba(0, 0, 0, 0.75); + background-clip: padding-box; + border: 1px solid #111; + border-radius: 3px; + cursor: pointer; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; + background-image: -webkit-linear-gradient(top, rgba(255,255,255,0.08),rgba(255,255,255,0) 50%,rgba(0,0,0,0) 51%,rgba(0,0,0,0.25)); + background-image: -moz-linear-gradient(top, rgba(255,255,255,0.08),rgba(255,255,255,0) 50%,rgba(0,0,0,0) 51%,rgba(0,0,0,0.25)); + background-image: -o-linear-gradient(top, rgba(255,255,255,0.08),rgba(255,255,255,0) 50%,rgba(0,0,0,0) 51%,rgba(0,0,0,0.25)); + background-image: linear-gradient(to bottom, rgba(255,255,255,0.08),rgba(255,255,255,0) 50%,rgba(0,0,0,0) 51%,rgba(0,0,0,0.25)); + -webkit-box-shadow: inset 0 1px rgba(255,255,255,0.1),inset 0 -1px 3px rgba(0,0,0,0.3),inset 0 0 0 1px rgba(255,255,255,0.08),0 1px 2px rgba(0,0,0,0.15); + box-shadow: inset 0 1px rgba(255,255,255,0.1),inset 0 -1px 3px rgba(0,0,0,0.3),inset 0 0 0 1px rgba(255,255,255,0.08),0 1px 2px rgba(0,0,0,0.15); +} + +#confirmBox .button:last-child { + margin-right:0; +} + +#confirmBox .green { + background-color: #3F7636; +} + +#confirmBox .green:hover { + background-color: #48873E; +} + +#confirmBox .red { + background-color: #8D2D2B; +} + +#confirmBox .red:hover { + background-color: #A13331; } \ No newline at end of file diff --git a/gui/slick/css/light.css b/gui/slick/css/light.css index e7901ab0..6fee266f 100644 --- a/gui/slick/css/light.css +++ b/gui/slick/css/light.css @@ -2895,4 +2895,99 @@ div.token-input-dropdown ul li.token-input-selected-dropdown-item { span.token-input-delete-token { margin: 0 1px; +} + +/* ======================================================================= +jquery.confirm.css +========================================================================== */ + +#confirmOverlay{ + width: 100%; + height: 100%; + position: fixed; + top: 0; + left: 0; + background: url('../images/bg.gif'); + background: -moz-linear-gradient(rgba(0,0,0,0.5), rgba(0,0,0,0.5)) repeat-x rgba(0,0,0,0.5); + background:-webkit-gradient(linear, 0% 0%, 0% 100%, from(rgba(0,0,0,0.5)), to(rgba(0,0,0,0.5))) repeat-x rgba(0,0,0,0.5); + z-index: 100000; +} + +#confirmBox{ + background: #F5F1E4; + width: 460px; + position: fixed; + left: 50%; + top: 50%; + margin: -130px 0 0 -230px; + border: 1px solid #111; + box-shadow: 0px 0px 12px 0px rgba(0, 0, 0, 0.175); +} + +#confirmBox h1, +#confirmBox p{ + padding: 6px 10px; +} + +#confirmBox h1 { + background-color: #333; + border-bottom: 1px solid #111; + color: #fff; + margin: 0; + font-size: 22px; + text-shadow: 0px 1px 1px rgba(0, 0, 0, 0.75); +} + +#confirmBox p { + padding-top: 20px; + color: #000; + text-shadow: 0px 1px 1px rgba(255, 255, 255, 0.75); +} + +#confirmButtons { + padding: 15px 0; + text-align: center; +} + +#confirmBox .button { + margin-right: 15px; + padding: 2px 20px; + text-decoration: none; + display: inline-block; + color: #fff; + text-align:center; + text-shadow: 0px 1px 1px rgba(0, 0, 0, 0.75); + background-clip: padding-box; + border: 1px solid #111; + border-radius: 3px; + cursor: pointer; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; + background-image: -webkit-linear-gradient(top, rgba(255,255,255,0.08),rgba(255,255,255,0) 50%,rgba(0,0,0,0) 51%,rgba(0,0,0,0.25)); + background-image: -moz-linear-gradient(top, rgba(255,255,255,0.08),rgba(255,255,255,0) 50%,rgba(0,0,0,0) 51%,rgba(0,0,0,0.25)); + background-image: -o-linear-gradient(top, rgba(255,255,255,0.08),rgba(255,255,255,0) 50%,rgba(0,0,0,0) 51%,rgba(0,0,0,0.25)); + background-image: linear-gradient(to bottom, rgba(255,255,255,0.08),rgba(255,255,255,0) 50%,rgba(0,0,0,0) 51%,rgba(0,0,0,0.25)); + -webkit-box-shadow: inset 0 1px rgba(255,255,255,0.1),inset 0 -1px 3px rgba(0,0,0,0.3),inset 0 0 0 1px rgba(255,255,255,0.08),0 1px 2px rgba(0,0,0,0.15); + box-shadow: inset 0 1px rgba(255,255,255,0.1),inset 0 -1px 3px rgba(0,0,0,0.3),inset 0 0 0 1px rgba(255,255,255,0.08),0 1px 2px rgba(0,0,0,0.15); +} + +#confirmBox .button:last-child { + margin-right:0; +} + +#confirmBox .green { + background-color: #3F7636; +} + +#confirmBox .green:hover { + background-color: #48873E; +} + +#confirmBox .red { + background-color: #8D2D2B; +} + +#confirmBox .red:hover { + background-color: #A13331; } \ No newline at end of file diff --git a/gui/slick/css/style.css b/gui/slick/css/style.css index 981b07ab..0a911d90 100644 --- a/gui/slick/css/style.css +++ b/gui/slick/css/style.css @@ -3000,4 +3000,99 @@ span.token-input-delete-token { } .red-text {color:#d33} -.clear-left {clear:left} \ No newline at end of file +.clear-left {clear:left} + +/* ======================================================================= +jquery.confirm.css +========================================================================== */ + +#confirmOverlay{ + width: 100%; + height: 100%; + position: fixed; + top: 0; + left: 0; + background: url('../images/bg.gif'); + background: -moz-linear-gradient(rgba(0,0,0,0.5), rgba(0,0,0,0.5)) repeat-x rgba(0,0,0,0.5); + background:-webkit-gradient(linear, 0% 0%, 0% 100%, from(rgba(0,0,0,0.5)), to(rgba(0,0,0,0.5))) repeat-x rgba(0,0,0,0.5); + z-index: 100000; +} + +#confirmBox{ + background: #F5F1E4; + width: 460px; + position: fixed; + left: 50%; + top: 50%; + margin: -130px 0 0 -230px; + border: 1px solid #111; + box-shadow: 0px 0px 12px 0px rgba(0, 0, 0, 0.175); +} + +#confirmBox h1, +#confirmBox p{ + padding: 6px 10px; +} + +#confirmBox h1 { + background-color: #333; + border-bottom: 1px solid #111; + color: #fff; + margin: 0; + font-size: 22px; + text-shadow: 0px 1px 1px rgba(0, 0, 0, 0.75); +} + +#confirmBox p { + padding-top: 20px; + color: #000; + text-shadow: 0px 1px 1px rgba(255, 255, 255, 0.75); +} + +#confirmButtons { + padding: 15px 0; + text-align: center; +} + +#confirmBox .button { + margin-right: 15px; + padding: 2px 20px; + text-decoration: none; + display: inline-block; + color: #fff; + text-align:center; + text-shadow: 0px 1px 1px rgba(0, 0, 0, 0.75); + background-clip: padding-box; + border: 1px solid #111; + border-radius: 3px; + cursor: pointer; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; + background-image: -webkit-linear-gradient(top, rgba(255,255,255,0.08),rgba(255,255,255,0) 50%,rgba(0,0,0,0) 51%,rgba(0,0,0,0.25)); + background-image: -moz-linear-gradient(top, rgba(255,255,255,0.08),rgba(255,255,255,0) 50%,rgba(0,0,0,0) 51%,rgba(0,0,0,0.25)); + background-image: -o-linear-gradient(top, rgba(255,255,255,0.08),rgba(255,255,255,0) 50%,rgba(0,0,0,0) 51%,rgba(0,0,0,0.25)); + background-image: linear-gradient(to bottom, rgba(255,255,255,0.08),rgba(255,255,255,0) 50%,rgba(0,0,0,0) 51%,rgba(0,0,0,0.25)); + -webkit-box-shadow: inset 0 1px rgba(255,255,255,0.1),inset 0 -1px 3px rgba(0,0,0,0.3),inset 0 0 0 1px rgba(255,255,255,0.08),0 1px 2px rgba(0,0,0,0.15); + box-shadow: inset 0 1px rgba(255,255,255,0.1),inset 0 -1px 3px rgba(0,0,0,0.3),inset 0 0 0 1px rgba(255,255,255,0.08),0 1px 2px rgba(0,0,0,0.15); +} + +#confirmBox .button:last-child { + margin-right:0; +} + +#confirmBox .green { + background-color: #3F7636; +} + +#confirmBox .green:hover { + background-color: #48873E; +} + +#confirmBox .red { + background-color: #8D2D2B; +} + +#confirmBox .red:hover { + background-color: #A13331; +} \ No newline at end of file diff --git a/gui/slick/interfaces/default/inc_top.tmpl b/gui/slick/interfaces/default/inc_top.tmpl index b3fca113..08d1a9c0 100644 --- a/gui/slick/interfaces/default/inc_top.tmpl +++ b/gui/slick/interfaces/default/inc_top.tmpl @@ -90,14 +90,14 @@ + diff --git a/gui/slick/js/confirmations.js b/gui/slick/js/confirmations.js index c5309fc2..f195cd60 100644 --- a/gui/slick/js/confirmations.js +++ b/gui/slick/js/confirmations.js @@ -47,7 +47,7 @@ $(document).ready(function () { var showname = document.getElementById("showtitle").getAttribute('data-showname'); $.confirm({ 'title' : 'Delete Show', - 'message' : 'Are you sure you want to permanently delete ' + showname + ' ?

WARNING - This process will also delete all stored files.
This process cannot be un-done.', + 'message' : 'Are you sure you want to permanently delete ' + showname + ' ?

WARNING - This process will also delete all stored files.
This process cannot be un-done.', 'buttons' : { 'Yes' : { 'class' : 'green', @@ -69,7 +69,7 @@ $(document).ready(function () { var showname = document.getElementById("showtitle").getAttribute('data-showname'); $.confirm({ 'title' : 'Remove Show', - 'message' : 'Are you sure you want to remove ' + showname + ' from the database ?', + 'message' : 'Are you sure you want to remove ' + showname + ' from the database ?', 'buttons' : { 'Yes' : { 'class' : 'green', diff --git a/gui/slick/js/submenu.js b/gui/slick/js/submenu.js deleted file mode 100644 index 7799ad38..00000000 --- a/gui/slick/js/submenu.js +++ /dev/null @@ -1,33 +0,0 @@ -function initActions() { - $("#SubMenu a[href*='/home/restart/']").addClass('btn restart').html(' Restart'); - $("#SubMenu a[href*='/home/shutdown/']").addClass('btn shutdown').html(' Shutdown'); - $("#SubMenu a[href*='/home/logout/']").addClass('btn').html(' Logout'); - $("#SubMenu a:contains('Edit')").addClass('btn').html(' Edit'); - $("#SubMenu a:contains('Delete')").addClass('btn delete').html(' Delete'); - $("#SubMenu a:contains('Remove')").addClass('btn remove').html(' Remove'); - $("#SubMenu a:contains('Clear History')").addClass('btn clearhistory').html(' Clear History'); - $("#SubMenu a:contains('Trim History')").addClass('btn trimhistory').html(' Trim History'); - $("#SubMenu a[href$='/errorlogs/clearerrors/']").addClass('btn').html(' Clear Errors'); - $("#SubMenu a:contains('Re-scan')").addClass('btn').html(' Re-scan'); - $("#SubMenu a:contains('Backlog Overview')").addClass('btn').html(' Backlog Overview'); - $("#SubMenu a[href$='/home/updatePLEX/']").addClass('btn').html(' Update PLEX'); - $("#SubMenu a:contains('Force')").addClass('btn').html(' Force Full Update'); - $("#SubMenu a:contains('Rename')").addClass('btn').html(' Preview Rename'); - $("#SubMenu a[href$='/config/subtitles/']").addClass('btn').html(' Search Subtitles'); - $("#SubMenu a[href*='/home/subtitleShow']").addClass('btn').html(' Download Subtitles'); - $("#SubMenu a:contains('Anime')").addClass('btn').html(' Anime'); - $("#SubMenu a:contains('Settings')").addClass('btn').html(' Search Settings'); - $("#SubMenu a:contains('Provider')").addClass('btn').html(' Search Providers'); - $("#SubMenu a:contains('Backup/Restore')").addClass('btn').html(' Backup/Restore'); - $("#SubMenu a:contains('General')").addClass('btn').html(' General'); - $("#SubMenu a:contains('Episode Status')").addClass('btn').html(' Episode Status Management'); - $("#SubMenu a:contains('Missed Subtitle')").addClass('btn').html(' Missed Subtitles'); - $("#SubMenu a[href$='/home/addShows/']").addClass('btn').html(' Add Show'); - $("#SubMenu a:contains('Processing')").addClass('btn').html(' Post-Processing'); - $("#SubMenu a:contains('Manage Searches')").addClass('btn').html(' Manage Searches'); - $("#SubMenu a:contains('Manage Torrents')").addClass('btn').html(' Manage Torrents'); - $("#SubMenu a[href$='/manage/failedDownloads/']").addClass('btn').html(' Failed Downloads'); - $("#SubMenu a:contains('Notification')").addClass('btn').html(' Notification'); - $("#SubMenu a:contains('Update show in XBMC')").addClass('btn').html(' Update show in XBMC'); - $("#SubMenu a[href$='/home/updateXBMC/']").addClass('btn').html(' Update XBMC'); -}