Add generic dialog (.dialog) class - replaces #advanced_search & #print-options dialogs.

scp/css/scp.css

@@ -1165,22 +1165,14 @@ time {
     margin-right:20px;
 }
 
-/* Advanced Search & Ticket print options */
-
-#search_overlay {
-    background:#000;
-    position:absolute;
-    display:none;
-    z-index:1000;
-}
-
-#advanced-search, #advanced-search *, #print-options, #print-options * {
+/* dialog */
+.dialog, .dialog * {
     box-sizing: border-box;
     -moz-box-sizing: border-box;
     -webkit-box-sizing: border-box;
 }
 
-#advanced-search, #print-options {
+.dialog {
     position:absolute;
     padding:1em;
     width:640px;
@@ -1191,12 +1183,12 @@ time {
     z-index:1200;
 }
 
-#print-options {
+.dialog#print-options {
     width:500px;
     height:250px;
 }
 
-#print-options hr {
+.dialog hr {
     height: 1px;
     border: 0;
     background: #aaa;
@@ -1208,7 +1200,7 @@ time {
     filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#00aaaaaa', endColorstr='#00aaaaaa',GradientType=1 ); /* IE6-9 */
 }
 
-#advanced-search h3, #print-options h3 {
+.dialog h3 {
     color:#2a67ac;
     font-size:20px;
     margin:0;
@@ -1216,14 +1208,14 @@ time {
     display:inline-block;
 }
 
-#advanced-search a.close, #print-options a.close {
+.dialog a.close {
     display:inline-block;
     float:right;
     font-size:16px;
     color:#777;
 }
 
-#advanced-search form, #print-options form {
+.dialog form {
     clear:both;
     padding-top:2em;
     width:100%;
@@ -1233,31 +1225,31 @@ time {
     display:none;
 }
 
-#advanced-search fieldset, #print-options fieldset {
+.dialog fieldset {
     margin:0;
     padding:0 0;
     border:none;
     overflow:hidden;
 }
 
-#advanced-search label, #print-options label {
+.dialog label {
     width:100px;
     display:inline-block;
     text-align:right;
     padding:10px;
 }
 
-#advanced-search fieldset input, #print-options fieldset input {
+.dialog fieldset input {
     border:1px solid #ccc;
     background:#fff;
 }
 
-#advanced-search fieldset select, #print-options fieldset select {
+.dialog fieldset select {
     width:170px;
     display:inline-block;
 }
 
-#advanced-search fieldset span, #print-options fieldset span {
+.dialog fieldset span {
     width:50px;
     display:inline-block;
     text-align:center;
@@ -1291,13 +1283,9 @@ time {
     text-align:center;
 }
 
-#advanced-search input[type="submit"],
-#advanced-search input[type="reset"],
-#advanced-search input[type="button"],
-#print-options input[type="submit"],
-#print-options input[type="reset"],
-#print-options input[type="button"]
-{
+.dialog input[type="submit"],
+.dialog input[type="reset"],
+.dialog input[type="button"] {
     display:inline-block;
     margin:0;
     height:24px;
@@ -1309,15 +1297,13 @@ time {
     color: #333;
 }
 
-#advanced-search input[type="reset"],
-#advanced-search input[type="button"],
-#print-options input[type="reset"],
-#print-options input[type="button"] {
+.dialog input[type="reset"],
+.dialog input[type="button"] {
     opacity:0.7;
 }
 
-#advanced-search input[type=submit]:hover, #advanced-search input[type=submit]:active,
-#advanced-search input[type=reset]:hover, #advanced-search input[type=reset]:active {
+.dialog input[type=submit]:hover, .dialog input[type=submit]:active,
+.dialog input[type=reset]:hover, .dialog input[type=reset]:active {
     background-position:bottom left;
 }
 

scp/js/scp.js

@@ -279,16 +279,39 @@ $(document).ready(function(){
         property: "email"
     });
 
-    /* advanced search */
-    $("#overlay, #search_overlay").css({
+    //Overlay
+    $('#overlay').css({
         opacity : 0.3,
         top     : 0,
         left    : 0,
         width   : $(window).width(),
         height  : $(window).height()
     });
+       
+    //Dialog
+    $('.dialog').css({
+        top  : ($(window).height() /5),
+        left : ($(window).width() / 2 - 300)
+    });
+      
+    $('.dialog').delegate('a.close', 'click', function(e) {
+        e.preventDefault();
+        $(this).parent().hide()
+        $('#overlay').hide();
+
+        return false;
+    });
 
-    $("#advanced-search").css({
+    $('.dialog').delegate('input.close', 'click', function(e) {
+        e.preventDefault();
+        $(this).closest('form').parent().hide()
+        $('#overlay').hide();
+
+        return false;
+    });
+
+    /* advanced search */
+    $('.dialog#advanced-search').css({
         top  : ($(window).height() / 6),
         left : ($(window).width() / 2 - 300)
     });
@@ -296,15 +319,11 @@ $(document).ready(function(){
     $('#go-advanced').click(function(e) {
         e.preventDefault();
         $('#result-count').html('');
-        $('#search_overlay').show();
+        $('#overlay').show();
         $('#advanced-search').show();
     });
 
-    $('#advanced-search').delegate('a.close, input.close', 'click', function(e) {
-        e.preventDefault();
-        $('#advanced-search').hide()
-        $('#search_overlay').hide();
-    }).delegate('#status', 'change', function() {
+    $('#advanced-search').delegate('#status', 'change', function() {
         switch($(this).val()) {
             case 'closed':
                 $('select#assignee').find('option:first').attr('selected', 'selected').parent('select');