fix plugin publish web UI

grails-samples · Nov 29, 2012 · 5ee0d40 · 5ee0d40
1 parent 87045fe
commit 5ee0d40
Show file tree

Hide file tree

Showing 3 changed files with 54 additions and 10 deletions.
diff --git a/grails-app/taglib/org/grails/helpers/CommonTagLib.groovy b/grails-app/taglib/org/grails/helpers/CommonTagLib.groovy
@@ -21,4 +21,8 @@ class CommonTagLib {
         out << "<span class=\"${type} ${type}-${labelClass}\">${status.toString()}</span>"
     }
 
+    def control = { attrs, body ->
+        out << g.render(template:'/common/inputControl', model:[field: attrs.field, bean: attrs.bean, title:attrs.title, desc:attrs.desc, body: body()])
+    }
+
 }
diff --git a/grails-app/views/common/_inputControl.gsp b/grails-app/views/common/_inputControl.gsp
@@ -0,0 +1,10 @@
+<div class="control-group ${hasErrors(bean: bean, field: field, 'error')}">
+    <label for="${field}">${title} <g:if test="${desc}"><small>(${desc})</small></g:if></label>
+
+    <div class="controls">
+        ${body}
+        <g:if test="${bean?.errors?.getFieldErrorCount(field) > 0}">
+            <p class="error-block">${bean.errors.getFieldError(field).defaultMessage}</p>
+        </g:if>
+    </div>
+</div>
diff --git a/grails-app/views/repository/publish.gsp b/grails-app/views/repository/publish.gsp
@@ -1,30 +1,60 @@
 <%@ page import="org.grails.wiki.WikiPage" %>
 <head>
+    <meta content="master" name="layout"/>
     <title>Publish Plugin</title>
-    <meta content="subpage" name="layout" />
+    <r:require modules="plugin"/>
 </head>
+
 <body>
+
+<div id="content" class="content-aside" role="main">
+
+    <div class="aside">
+        <g:render template="/plugin/sideSubmission"/>
+    </div>
+
+    <section id="main" class="items">
     <div id="editPane">
         <h1>Publish Plugin</h1>
+
         <g:if test="${message}">
-            <div class="message">${message}</div>
-        </g:if>
+                <div class="alert">${message}</div>
+        </g:if>        
 
         <g:hasErrors bean="${publishCommand}">
             <div id="errors" class="errors">
                 <g:renderErrors bean="${publishCommand}"></g:renderErrors>
             </div>
         </g:hasErrors>
 
-        <g:uploadForm name="publishPlugin" url="[controller:'repository', action:'publish']" method="POST">
+        <g:uploadForm name="publishPlugin" url="[controller:'repository', action:'publish']" method="POST" class="content-form padding-top">
             <input type="hidden" name="format" value="html" />
-            Plugin Name:&nbsp;&nbsp;&nbsp;<g:textField id="plugin" name="plugin" value="${publishCommand?.plugin}" /> <br /><br/>
 
-            Plugin Version:&nbsp;&nbsp;&nbsp;<g:textField id="version" name="version" value="${publishCommand?.version}" /> <br /><br/>
-            Plugin ZIP:&nbsp;&nbsp;&nbsp;<g:field type="file" name="zip" /> <br /><br/>
-            Plugin POM:&nbsp;&nbsp;&nbsp;<g:field type="file" name="pom" /> <br /><br/>
-            Plugin XML:&nbsp;&nbsp;&nbsp;<g:field type="file" name="xml" /> <br /><br/>
-            <g:submitButton name="publish" value="Publish" />
+            <common:control field="plugin" bean="${publishCommand}" title="Plugin Name:">
+                <g:textField name="plugin" value="${publishCommand?.plugin}" required="required" class="input-fullsize"/>
+            </common:control>       
+
+            <common:control field="version" bean="${publishCommand}" title="Plugin Version:">
+                <g:textField name="version" value="${publishCommand?.version}" required="required" class="input-fullsize"/>
+            </common:control>                          
+
+            <common:control field="zip" bean="${publishCommand}" title="Plugin ZIP:">
+                <g:field type="file" name="zip" class="input-fullsize"/>                
+            </common:control>       
+
+            <common:control field="pom" bean="${publishCommand}" title="Plugin POM:">
+                <g:field type="file" name="pom" class="input-fullsize"/>                
+            </common:control>                           
+
+            <common:control field="xml" bean="${publishCommand}" title="Plugin XML:">
+                <g:field type="file" name="xml" class="input-fullsize"/>                
+            </common:control>                           
+
+            <g:submitButton name="publish" value="Publish" class="btn" />
         </g:uploadForm>
     </div>
+    </section>
+
+</div>
+
 </body>