From 4546aaad9878ee1411d3173d09c5dd0c82442cd3 Mon Sep 17 00:00:00 2001 From: Paulo Gustavo Veiga Date: Fri, 18 May 2012 23:43:22 -0300 Subject: [PATCH] Fix Rename and Dup Actions ... --- wise-editor/src/main/webapp/css/editor.less | 115 ++-- wise-webapp/src/main/webapp/css/common.css | 532 ------------------ wise-webapp/src/main/webapp/css/mymaps.less | 5 +- .../src/main/webapp/css/pageHeaders.css | 186 ++++++ .../src/main/webapp/css/pageTemplate.css | 110 +++- .../src/main/webapp/jsp/forgotPassword.jsp | 4 +- wise-webapp/src/main/webapp/jsp/login.jsp | 2 +- .../src/main/webapp/jsp/mindmapList.jsp | 124 ++-- 8 files changed, 397 insertions(+), 681 deletions(-) delete mode 100644 wise-webapp/src/main/webapp/css/common.css create mode 100644 wise-webapp/src/main/webapp/css/pageHeaders.css diff --git a/wise-editor/src/main/webapp/css/editor.less b/wise-editor/src/main/webapp/css/editor.less index 208da7f6..c63654cd 100644 --- a/wise-editor/src/main/webapp/css/editor.less +++ b/wise-editor/src/main/webapp/css/editor.less @@ -225,86 +225,53 @@ td.formLabel { vertical-align: top; } - -/* */ -.btn-primary { - cursor: pointer; - display: inline-block; - padding: 5px 14px 6px; - text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75); - color: #333; - font-size: 13px; - line-height: normal; - border: 1px solid #ccc; - border-bottom-color: #bbb; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); - -webkit-transition: 0.1s linear all; - -moz-transition: 0.1s linear all; - -ms-transition: 0.1s linear all; - -o-transition: 0.1s linear all; - transition: 0.1s linear all; - color: #ffffff; - background-color: #0064cd; - background-repeat: repeat-x; - background-image: -khtml-gradient(linear, left top, left bottom, from(#049cdb), to(#0064cd)); - background-image: -moz-linear-gradient(top, #049cdb, #0064cd); - background-image: -ms-linear-gradient(top, #049cdb, #0064cd); - background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #049cdb), color-stop(100%, #0064cd)); - background-image: -webkit-linear-gradient(top, #049cdb, #0064cd); - background-image: -o-linear-gradient(top, #049cdb, #0064cd); - background-image: linear-gradient(top, #049cdb, #0064cd); - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - border-color: #0064cd #0064cd #003f81; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - margin-top: 7px; +#keyboardTable { + clear: both; + width: 100%; + height: 300px; + overflow: auto; + border: 0 solid gray; + background-color: white; + z-index: 2; + position: relative; } -.btn-primary:hover { - background-position: 0 -15px; - text-decoration: none; +#keyboardTable table { + width: 100%; + border: 0 solid gray; } -.btn-secondary { - cursor: pointer; - display: inline-block; - background-color: #e6e6e6; - background-repeat: no-repeat; - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6)); - background-image: -webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6); - background-image: -moz-linear-gradient(top, #ffffff, #ffffff 25%, #e6e6e6); - background-image: -ms-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6); - background-image: -o-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6); - background-image: linear-gradient(#ffffff, #ffffff 25%, #e6e6e6); - padding: 5px 14px 6px; - text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75); - color: #333; - font-size: 13px; - line-height: normal; - border: 1px solid #ccc; - border-bottom-color: #bbb; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); - -webkit-transition: 0.1s linear all; - -moz-transition: 0.1s linear all; - -ms-transition: 0.1s linear all; - -o-transition: 0.1s linear all; - transition: 0.1s linear all; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - margin-top: 7px; +#keyboardTable thead { + background-color: #093A9D; + font-size: 12px; + font-weight: normal; + padding: 5px; +} + +#keyboardTable td { + border-bottom: 1px solid #EEEEEE; + color: #5f5f5f; + font-size: 12px; + padding: 3px; +} + +#keyboardTable th { + color: white; + border-right: 1px dotted #ffffff; + font-weight: bold; + text-align: center; + font-size: 12px; + padding: 5px; +} + +#keyboardTable tbody tr:hover { + background-color: #E2f0f6; +} + +#keyboardTable tr { + padding: 5px; } -.btn-secondary:hover { - background-position: 0 -15px; - text-decoration: none; } /*--- Modal Dialog Form ---*/ diff --git a/wise-webapp/src/main/webapp/css/common.css b/wise-webapp/src/main/webapp/css/common.css deleted file mode 100644 index 0c55644d..00000000 --- a/wise-webapp/src/main/webapp/css/common.css +++ /dev/null @@ -1,532 +0,0 @@ -body, div, dl, dt, dd, ul, ol, li, h1, h2, h3, h4, h5, h6, pre, form, fieldset, input, textarea, p, blockquote, th, td { - margin: 0; - padding: 0; -} - -table { - border-collapse: collapse; - border-spacing: 0; -} - -fieldset, img { - border: 0; -} - -address, caption, cite, code, dfn, em, strong, th, var { - font-style: normal; - font-weight: normal; -} - -ol, ul { - list-style: none; -} - -caption, th { - text-align: left; -} - -h1, h2, h3, h4, h5, h6 { - font-size: 100%; - font-weight: normal; -} - -q:before, q:after { - content: ''; -} - -abbr, acronym { - border: 0; -} - -/** - * Percents could work for IE, but for backCompat purposes, we are using keywords. - * x-small is for IE6/7 quirks mode. - * - */ -body { - font: 13px arial, helvetica, clean, sans-serif; - font-size: small; - font: x-small; -} - -table { - font-size: inherit; - font-size: 100%; -} - -/** - * 99% for safari; 100% is too large - */ -select, input, textarea { - font: 99% arial, helvetica, clean, sans-serif; -} - -/** - * Bump up !IE to get to 13px equivalent - */ -pre, code { - font: 115% monospace; - font-size: 100%; -} - -/** - * Default line-height based on font-size rather than "computed-value" - * see: http://www.w3.org/TR/CSS21/visudet.html#line-height - */ - -body * { - line-height: 1.22em; -} - -* { - margin: 0; - padding: 0; -} - -body { - font: normal 80% "trebuchet ms", verdana, arial, helvetica, sans-serif; - background-color: #fff; -} - -img { - border: 0; -} - -form { - padding: 0px; - margin: 0px; -} - -p { - margin: 5px 0 5px 0; -} - -ul { - list-style-position: inside; -} - -a:link, a:visited { - font: bold 100%; - text-decoration: underline; - color: black; -} - -a:hover, a:active { - font: bold 100%; - text-decoration: underline; - color: black; -} - -h2 { - font-size: 160%; - color: #8e9181; -} - -h1 { - font-style: normal; - font-size: 180%; - color: white; - padding-bottom: 2px; -} - -h3 { - /* use as subhead on main body */ - clear: left; - font-style: normal; - font-size: 130%; - color: #6b6f5b; -} - -h4 { - /* use as headers in footer */ - font-weight: bold; - font-size: 120%; - border-bottom: 1px solid #8e9181; - color: #e2e3dd; - padding-bottom: 10px; - width: 400px; -} - -#centerContent { - text-align: center; -} - -/* HEADER STYLES */ - -#header { - margin-top: 2px; - height: 78px; - width: 100%; - background: white; - border-bottom: 1px solid #bbb4d6; - position: absolute; - top: 0; - left: 0; -} - -#headerToolbar { - height: 25px; - width: 100%; - background-color: #171a17; - border-top: 1px solid #999999; - border-bottom: 1px solid #424141; - color: white; - font-size: small; - font-style: normal; -} - -#headerContent { - width: 800px; - height: 78px; - position: relative; - top: 0; - left: 0; - margin: auto; -} - -#headerLogo { - margin-top: 8px; - height: 80px; - width: 160px; - background: url("../images/logo-medium.png") no-repeat; - position: absolute; - top: 0; - left: -50px; -} - -#headerSlogan { - position: absolute; - border-left: 1px dashed gray; - margin-top: 8px; - height: 1em; - width: 100px; - top: 40px; - left: 137px; - white-space: nowrap; - padding-left: 7px; - font-weight: bold; - vertical-align: middle; -} - -#headerButtons { - position: absolute; - top: 65px; - left: 150px; -} - -#newsLink, #blogLink, #aboutLink, #newsLink, #faqLink, #feedbackLink, #supportLink, #logoutLink { - float: right; - z-index: 300; -} - -div#headerButtons a { - float: left; - color: #6F6F6F; - padding: 0 10px; - text-decoration: none; - font-weight: bold; - font-size: 120%; - white-space: nowrap; -} - -div#headerTitle { - float: left; - font-weight: bold; - font-size: 15px; - margin-right: 5px; - margin-left: 5px; -} - - -span#headerSubTitle { - font-weight: lighter; - font-size: 12px; -} - -div#headerButtons a:hover { - /*text-decoration: underline;*/ - color: #7e72ad; -} - -div#headerButtons activelink a, div#headerButtons activelink a:hover { - text-decoration: none; - border-top: 0; - border-bottom: 0; -} - -#signUpHeader { - padding-right: 8px; - padding-top: 4px; - position: absolute; - right: 0; - z-index: 50; - text-align: center; -} - -#signUpHeader a, #signUpHeader a:hover { - font-size: 100%; - color: #BBB4D6; - text-decoration: underline; -} - -#editorHeader { - height: 40px; - width: 100%; - background: white; - border-bottom: 1px solid #bbb4d6; - position: absolute; - top: 0; - left: 0; -} - -#editorHeader #headerToolbar { - height: 40px; - width: 100%; - background-color: #171a17; - border-top: 1px solid #999999; - border-bottom: 1px solid #424141; - color: white; - font-size: small; - font-style: normal; -} - -div#editorHeader div#headerTitle { - float: left; - font-weight: bold; - font-size: 22px; - margin-right: 5px; - margin-left: 5px; -} - -div#editorHeader span#headerSubTitle { - font-weight: lighter; - font-size: 12px; -} - -div#editorHeader div#headerActions { - padding-right: 8px; - padding-top: 4px; - position: absolute; - right: 0; - top: 4px; - z-index: 50; -} - -div#editorHeader div#headerActions a:hover, div#headerActions a:active, div#headerActions a:link, div#headerActions a:visited { - color: white; -} - -#footer { - width: 100%; - border-top: 1px solid #8e9181; - text-align: center; - font-size: 90%; - background-color: white; - float: left; -} - - -div#paypal { - float: left; - margin: -29px; -} - -.errorMsg { - color: #990000; - font-size: 90%; - font-weight: bold; - padding-left: 5px; -} - -#headerLogo { - cursor: pointer; -} - -#headerLoading { - padding-left: 40px; - background: url('../images/ajax-loader.gif') #BBB4D6 no-repeat left; - position: absolute; - right: 3px; - top: 5px; - width: 75px; - height: 20px; - color: white; - font-weight: bold; - border: 1px solid; - border-color: #f5f5f5; - background-position: 5px 2px; - visibility: hidden; -} - -div#headerActions { - padding-right: 8px; - padding-top: 4px; - position: absolute; - right: 0; - z-index: 50; -} - -div#headerActions a:hover, div#headerActions a:active, div#headerActions a:link, div#headerActions a:visited { - color: white; -} - -div.header_languages { - position: absolute; - right: 0; - top: 30px; - width: 100px; - height: 20px; -} - -div.header_language_flag { - float: left; - margin-right: 3px; -} - -/*-- Main Page Style -- */ -div.pageBody { - margin: 10px auto; - width: 800px; - min-height: 500px; -} - -div.pageBodyContent { - padding-top: 30px; -} - -div.pageBodyContent h1 { - color: #093A9D; - font-size: 200%; - margin-bottom: 5px; - font-weight: bold; -} - -div.pageBodyContent h2 { - color: gray; - font-size: 150%; - border-bottom: 1px dashed #BBB4D6; - margin: 20px 0; -} - -div.pageBodyContent ul { - padding: 5px; -} - -div.pageBodyContent li { - list-style-type: disc; - margin-left: 12px; -} - -/*-- End Main Page Style -- */ - -/* Share Styles */ -#userEmails { - float: left; - width: 50%; - padding: 5px; -} - -#userEmails textarea { - width: 100%; -} - -#currentUsers { - float: left; - width: 40%; - height: 400px; - padding: 5px; - padding-left: 15px; - margin-left: 15px; - border-left: 1px dotted gray; -} - -#currentUsers table { - width: 100%; -} - -#invitation { - border: 1px dotted gray; -} - -td.formLabel { - text-align: right; - padding: 2px 10px; - white-space: nowrap; - font-weight: bolder; - vertical-align: top; -} - -span.fieldRequired { - font-weight: bold; - color: #ff4500; - margin: 0 4px; -} - -#keyboardTable { - clear: both; - width: 100%; - height: 300px; - overflow: auto; - border: 0 solid gray; - background-color: white; - z-index: 2; - position: relative; -} - -#keyboardTable table { - width: 100%; - border: 0 solid gray; -} - -#keyboardTable thead { - background-color: #093A9D; - font-size: 12px; - font-weight: normal; - padding: 5px; -} - -#keyboardTable td { - border-bottom: 1px solid #EEEEEE; - color: #5f5f5f; - font-size: 12px; - padding: 3px; -} - -#keyboardTable th { - color: white; - border-right: 1px dotted #ffffff; - font-weight: bold; - text-align: center; - font-size: 12px; - padding: 5px; -} - -#keyboardTable tbody tr:hover { - background-color: #E2f0f6; -} - -#keyboardTable tr { - padding: 5px; -} - -div.installCFG { - width: 100%; - font-size: 130%; -} - -div.installCFG h1 { - width: 100%; - font-size: 130%; -} - -div.installCFG h2 { - font-size: 100%; - border-bottom: 0 solid black; -} - -.chromeFrameInstallDefaultStyle { - position: relative; - left: 0; - top: 0; - margin: 0; -} \ No newline at end of file diff --git a/wise-webapp/src/main/webapp/css/mymaps.less b/wise-webapp/src/main/webapp/css/mymaps.less index 597a5edc..3e0c244c 100644 --- a/wise-webapp/src/main/webapp/css/mymaps.less +++ b/wise-webapp/src/main/webapp/css/mymaps.less @@ -1,4 +1,7 @@ -@import "css/common.css"; +@import "bootstrap/css/bootstrap.min.css"; +@import "bootstrap/css/bootstrap-responsive.min.css"; +@import "css/pageHeaders.css"; + @html-background: #dedede repeat-x scroll; @body-width: 956px; diff --git a/wise-webapp/src/main/webapp/css/pageHeaders.css b/wise-webapp/src/main/webapp/css/pageHeaders.css new file mode 100644 index 00000000..7d8936a7 --- /dev/null +++ b/wise-webapp/src/main/webapp/css/pageHeaders.css @@ -0,0 +1,186 @@ +/* HEADER STYLES */ +#header { + margin-top: 2px; + height: 78px; + width: 100%; + background: white; + border-bottom: 1px solid #bbb4d6; + position: absolute; + top: 0; + left: 0; +} + +#headerToolbar { + height: 25px; + width: 100%; + background-color: #171a17; + border-top: 1px solid #999999; + border-bottom: 1px solid #424141; + color: white; + font-size: small; + font-style: normal; +} + +#headerContent { + width: 800px; + height: 78px; + position: relative; + top: 0; + left: 0; + margin: auto; +} + +#headerLogo { + margin-top: 8px; + height: 80px; + width: 160px; + background: url("../images/logo-medium.png") no-repeat; + position: absolute; + top: 0; + left: -50px; +} + +#headerSlogan { + position: absolute; + border-left: 1px dashed gray; + margin-top: 8px; + height: 1em; + width: 100px; + top: 40px; + left: 137px; + white-space: nowrap; + padding-left: 7px; + font-weight: bold; + vertical-align: middle; +} + +#headerButtons { + position: absolute; + top: 65px; + left: 150px; +} + +#aboutLink, #faqLink, #feedbackLink, #logoutLink { + float: right; + z-index: 300; +} + +div#headerButtons a { + float: left; + color: #6F6F6F; + padding: 0 10px; + text-decoration: none; + font-weight: bold; + font-size: 120%; + white-space: nowrap; +} + +div#headerTitle { + float: left; + font-weight: bold; + font-size: 15px; + margin-right: 5px; + margin-left: 5px; +} + + +span#headerSubTitle { + font-weight: lighter; + font-size: 12px; +} + +div#headerButtons a:hover { + /*text-decoration: underline;*/ + color: #7e72ad; +} + +div#headerButtons activelink a, div#headerButtons activelink a:hover { + text-decoration: none; + border-top: 0; + border-bottom: 0; +} + +#signUpHeader { + padding-right: 8px; + padding-top: 4px; + position: absolute; + right: 0; + z-index: 50; + text-align: center; +} + +#signUpHeader a, #signUpHeader a:hover { + font-size: 100%; + color: #BBB4D6; + text-decoration: underline; +} + +#editorHeader { + height: 40px; + width: 100%; + background: white; + border-bottom: 1px solid #bbb4d6; + position: absolute; + top: 0; + left: 0; +} + +#footer { + width: 100%; + border-top: 1px solid #8e9181; + text-align: center; + font-size: 90%; + background-color: white; + float: left; +} + +div#paypal { + float: left; + margin: -29px; +} + + +#headerLogo { + cursor: pointer; +} + +#headerLoading { + padding-left: 40px; + background: url('../images/ajax-loader.gif') #BBB4D6 no-repeat left; + position: absolute; + right: 3px; + top: 5px; + width: 75px; + height: 20px; + color: white; + font-weight: bold; + border: 1px solid; + border-color: #f5f5f5; + background-position: 5px 2px; + visibility: hidden; +} + +div#headerActions { + padding-right: 8px; + padding-top: 4px; + position: absolute; + right: 0; + z-index: 50; +} + +div#headerActions a:hover, div#headerActions a:active, div#headerActions a:link, div#headerActions a:visited { + color: white; +} + +div.header_languages { + position: absolute; + right: 0; + top: 30px; + width: 100px; + height: 20px; +} + +div.header_language_flag { + float: left; + margin-right: 3px; +} \ No newline at end of file diff --git a/wise-webapp/src/main/webapp/css/pageTemplate.css b/wise-webapp/src/main/webapp/css/pageTemplate.css index dc6854fc..f05930cc 100644 --- a/wise-webapp/src/main/webapp/css/pageTemplate.css +++ b/wise-webapp/src/main/webapp/css/pageTemplate.css @@ -1,5 +1,5 @@ -/* GLOBAL COMPONENTS */ -@import "common.css"; +@import "../bootstrap/css/bootstrap.min.css"; +@import "pageHeaders.css"; /* INTRO STYLES */ .button { @@ -191,3 +191,109 @@ div.pageBodyContent ol li { border-radius: 16px; } +.errorMsg { + color: #990000; + font-size: 90%; + font-weight: bold; + padding-left: 5px; +} + +div.pageBody { + margin: 10px auto; + width: 800px; + min-height: 500px; +} + +div.pageBodyContent { + padding-top: 30px; +} + +div.pageBodyContent h1 { + color: #093A9D; + font-size: 200%; + margin-bottom: 5px; + font-weight: bold; +} + +div.pageBodyContent h2 { + color: gray; + font-size: 150%; + border-bottom: 1px dashed #BBB4D6; + margin: 20px 0; +} + +div.pageBodyContent ul { + padding: 5px; +} + +div.pageBodyContent li { + list-style-type: disc; + margin-left: 12px; +} + +/*-- End Main Page Style -- */ + +/* Share Styles */ +#userEmails { + float: left; + width: 50%; + padding: 5px; +} + +#userEmails textarea { + width: 100%; +} + +#currentUsers { + float: left; + width: 40%; + height: 400px; + padding: 5px; + padding-left: 15px; + margin-left: 15px; + border-left: 1px dotted gray; +} + +#currentUsers table { + width: 100%; +} + +#invitation { + border: 1px dotted gray; +} + +td.formLabel { + text-align: right; + padding: 2px 10px; + white-space: nowrap; + font-weight: bolder; + vertical-align: top; +} + +span.fieldRequired { + font-weight: bold; + color: #ff4500; + margin: 0 4px; +} + +div.installCFG { + width: 100%; + font-size: 130%; +} + +div.installCFG h1 { + width: 100%; + font-size: 130%; +} + +div.installCFG h2 { + font-size: 100%; + border-bottom: 0 solid black; +} + +.chromeFrameInstallDefaultStyle { + position: relative; + left: 0; + top: 0; + margin: 0; +} \ No newline at end of file diff --git a/wise-webapp/src/main/webapp/jsp/forgotPassword.jsp b/wise-webapp/src/main/webapp/jsp/forgotPassword.jsp index 6d62a835..5bddf0cf 100755 --- a/wise-webapp/src/main/webapp/jsp/forgotPassword.jsp +++ b/wise-webapp/src/main/webapp/jsp/forgotPassword.jsp @@ -35,9 +35,9 @@   - " class="btn-primary" + " class="btn btn-primary" id="submitButton"> - " class="btn-secondary" + " class="btn" onclick="window.location=''"> diff --git a/wise-webapp/src/main/webapp/jsp/login.jsp b/wise-webapp/src/main/webapp/jsp/login.jsp index bb8624fb..075fd1c9 100644 --- a/wise-webapp/src/main/webapp/jsp/login.jsp +++ b/wise-webapp/src/main/webapp/jsp/login.jsp @@ -64,7 +64,7 @@   - ">
"> diff --git a/wise-webapp/src/main/webapp/jsp/mindmapList.jsp b/wise-webapp/src/main/webapp/jsp/mindmapList.jsp index ef352f0b..ac3b8050 100644 --- a/wise-webapp/src/main/webapp/jsp/mindmapList.jsp +++ b/wise-webapp/src/main/webapp/jsp/mindmapList.jsp @@ -15,8 +15,6 @@ - - @@ -182,7 +180,7 @@ }); }); - $("#importMap").click(function() { + $("#importBtn").click(function() { window.open('c/map/import.htm'); }); @@ -195,7 +193,7 @@ // Obtain map name ... var rowData = tableElem.dataTable().fnGetData(rows[0]); - $('#duplicateMessage').text("Duplicate '" + rowData.title + "'"); + $('#dupDialogTitle').text("Duplicate '" + rowData.title + "'"); // Obtains map id ... var mapId = rowData.id; @@ -211,9 +209,7 @@ } }); - $("#actionButtons .renameMap").button({ - icons: { primary: "ui-icon-gear" } - }).click(function() { + $("#renameBtn").click(function() { // Map to be cloned ... var tableElem = $('#mindmapListTable'); var rows = tableElem.dataTableExt.getSelectedRows(); @@ -228,6 +224,11 @@ $("#rename-dialog-modal input[name='title']").attr('value', rowData.title); $("#rename-dialog-modal input[name='description']").attr('value', rowData.description); + + // Set title ... + $('#renameDialogTitle').text("Rename '" + rowData.title + "'"); + + // Initialize dialog ... $("#rename-dialog-modal").dialogForm({ modal: true, @@ -249,27 +250,25 @@ }); - $("#actionButtons .delete").button({ - icons: { primary: "ui-icon-trash" } - }).click(function() { - var mapIds = $('#mindmapListTable').dataTableExt.getSelectedMapsIds(); - if (mapIds.length > 0) { - var html2 = $('#delete-dialog-modal p span'); - $("#delete-dialog-modal").dialog({ - height: 140, - modal: true, - buttons: { - "Delete": function() { - $('#mindmapListTable').dataTableExt.removeSelectedRows(); - $(this).dialog("close"); - }, - Cancel: function() { - $(this).dialog("close"); - } - } - }); + $("#deleteBtn").click(function() { + var mapIds = $('#mindmapListTable').dataTableExt.getSelectedMapsIds(); + if (mapIds.length > 0) { + var html2 = $('#delete-dialog-modal p span'); + $("#delete-dialog-modal").dialog({ + height: 140, + modal: true, + buttons: { + "Delete": function() { + $('#mindmapListTable').dataTableExt.removeSelectedRows(); + $(this).dialog("close"); + }, + Cancel: function() { + $(this).dialog("close"); + } } }); + } + }); $("#actionButtons .printMap").button({ icons: { primary: "ui-icon-print" } @@ -294,19 +293,6 @@ icons: { primary: "ui-icon-print" } }).click(function() { }); - - $("#actionButtons .moreActions").button({ - icons: { - primary: "ui-icon-gear", - secondary: "ui-icon-triangle-1-s" - }, - text: false - }).click(function() { - $("#actionPane").toggle('fast', function(event) { - console.log(event); - }); - }); - }); // Register time update functions .... @@ -343,8 +329,8 @@