Merge pull request #352 from s-sab/master

Fixed 'Restart when no job is running' button. Resolve issue HUDSON-9025.
hudson · Feb 6, 2012 · 1628d81 · 1628d81
2 parents 6943a59 + 580e263
commit 1628d81
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 28 deletions.
diff --git a/hudson-core/src/main/resources/hudson/PluginManager/installed.jelly b/hudson-core/src/main/resources/hudson/PluginManager/installed.jelly
@@ -103,12 +103,14 @@ THE SOFTWARE.
 
       <j:if test="${it.isPluginUploaded()}">
         <div style="margin: 1em; height: 1em">
-          <div class="error">
-            ${%New plugins will take effect once you restart Hudson}
-            <j:if test="${app.lifecycle.canRestart()}">
-              <s:submit value="${%Restart Once No Jobs Are Running}" />
-            </j:if>
-          </div>
+          <form method="post" action="${rootURL}/safeRestart">
+            <div class="error">
+              ${%New plugins will take effect once you restart Hudson}
+              <j:if test="${app.lifecycle.canRestart()}">
+                <s:submit value="${%Restart Once No Jobs Are Running}" />
+              </j:if>
+            </div>
+          </form>
         </div>
       </j:if>
       <div class="warning" id="needRestart" style="display:none; margin: 1em; height: 1em">

diff --git a/hudson-core/src/main/resources/hudson/security/SecurityRealm/loginDialog.jelly b/hudson-core/src/main/resources/hudson/security/SecurityRealm/loginDialog.jelly
@@ -61,22 +61,6 @@ THE SOFTWARE.
             <input style="margin-left:10px; width:75px" type="button" id="cancelButton" value="${%Cancel}" />
 
         </form>
-        <style type="text/css">
-            #loginError, #loginMsg {
-                opacity:0;
-                -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";
-                filter: alpha(opacity=0);
-                text-align:center;
-                font-weight:bold;
-            }
-            #loginError {
-                color: red;
-            }
-            #loginMsg {
-                color: black;
-            }
-        </style>
-
         <div id="loginError">
             ${%Invalid login information. Please try again.}
         </div>

diff --git a/hudson-core/src/main/resources/hudson/security/SecurityRealm/loginLink.jelly b/hudson-core/src/main/resources/hudson/security/SecurityRealm/loginLink.jelly
@@ -45,11 +45,13 @@ THE SOFTWARE.
               title:  'Confirmation'
             });
             jQuery('j_username').focus();
+            jQuery('#loginMsg').hide();
+            jQuery('#loginError').hide();
         }
 
         function submitForm(){
-            jQuery('#loginMsg').css({ opacity: 1.0 });
-            jQuery('#loginError').css({ opacity: 0.0 });
+            jQuery('#loginMsg').show();
+            jQuery('#loginError').hide();
             var dataString = jQuery("#loginForm").serialize();
             jQuery.ajax({
               type: 'POST',
@@ -59,8 +61,8 @@ THE SOFTWARE.
                 window.location.href="${from}";
               },
               error: function(){
-                jQuery('#loginError').css({ opacity: 1.0 });
-                jQuery('#loginMsg').css({ opacity: 0.0 });
+                jQuery('#loginError').show();
+                jQuery('#loginMsg').hide();
               },
               dataType: "html"
             }); 
@@ -90,8 +92,8 @@ THE SOFTWARE.
                 jQuery.unblockUI();
                 jQuery('#j_username').attr({value:""});
                 jQuery('#j_password').attr({value:""});
-                jQuery('#loginError').css({ opacity: 0.0 });
-                jQuery('#loginMsg').css({ opacity: 0.0 });
+                jQuery('#loginError').hide();
+                jQuery('#loginMsg').hide();
                 return false;
             });
 

diff --git a/hudson-war/src/main/webapp/css/style.css b/hudson-war/src/main/webapp/css/style.css
@@ -1073,3 +1073,16 @@ table.configure > td {
     border-collapse: collapse;
     width: 450px;
 }
+/* === Login Dialog ==== */
+#loginError, #loginMsg {
+    text-align:center;
+    font-weight:bold;
+}
+#loginError {
+    color: red;
+    display: none;
+}
+#loginMsg {
+    color: black;
+    display: none;
+}