[GSIP-149] Improved GeoServer Style Page

geoserver · Aug 9, 2016 · 6084b54 · 6084b54
1 parent e8b4b2c
commit 6084b54
Show file tree

Hide file tree

Showing 40 changed files with 2,297 additions and 703 deletions.
diff --git a/src/web/wms/src/main/java/org/geoserver/wms/web/data/AbstractStylePage.html b/src/web/wms/src/main/java/org/geoserver/wms/web/data/AbstractStylePage.html
@@ -1,64 +1,24 @@
 <html xmlns:wicket="http://wicket.apache.org/">
 <body>
 <wicket:extend>
-    <form wicket:id="form" id="mainForm">
+    <h1><span wicket:id="stylename"></span></h1>
-    <ul>
+    <form wicket:id="styleForm" id="styleForm">
-        <li>
+        <div wicket:id="context" style="margin-bottom: 3em"> </div>
-            <label for="name"><wicket:message key="name">Name</wicket:message></label>
+        <fieldset>
-            <input wicket:id="name" class="text"></input>
+            <legend>
-        </li>
+              <span><wicket:message key="editorSpan">Style Editor</wicket:message></span>
-        <li>
+            </legend>
-            <label for="workspace"><wicket:message key="workspace">Workspace</wicket:message></label>
+        <div class="field textarea" wicket:id="styleEditor"> </div>
-            <select wicket:id="workspace"></select>
+        </fieldset>
-        </li>
+        <div wicket:id="popup"></div>
-        <li>
-            <label for="format"><wicket:message key="format">Format</wicket:message></label>
-            <select wicket:id="format"></select>
-            <div wicket:id="formatReadOnly" class="info-link" style="display: inline-block;">
-              <wicket:message key="formatReadOnly"></wicket:message>
-            </div>
-        </li>
-        <li>
-            <label for="legend"><wicket:message key="legend">Legend</wicket:message></label>
-            <span wicket:id="legendPanel"></span>
-        </li>
-        <li>
-            <label for="name"><wicket:message key="generateNew">GenerateNew</wicket:message></label>
-            <select wicket:id="templates"></select>
-            <a href="#" wicket:id="generate"><wicket:message key="generate">Generate</wicket:message></a>
-        </li>
-        <li>
-            <label for="name"><wicket:message key="copyFrom">CopyFrom</wicket:message></label>
-            <select wicket:id="existingStyles"></select>
-            <a href="#" wicket:id="copy"><wicket:message key="copy">Copy</wicket:message></a>
-        </li>
-    </ul>
-    <div class="field textarea" wicket:id="styleEditor"> </div>
-
     </form>
-
-    <form wicket:id="uploadForm" id="uploadForm"><label
-        for="filename"><wicket:message key="styleFile">Style file</wicket:message></label>
-    <input type="file" wicket:id="filename"></input> <a id="uploadFormSubmit" href="#"
-        onclick="document.forms['uploadForm'].submit()"><wicket:message key="upload">Upload</wicket:message></a>
-    </form>
-
-    <br/>
-
     <div class="button-group selfclear">
        <a href="#" wicket:id="validate"><wicket:message key="validate">Validate</wicket:message></a>
-       <a href="#" wicket:id="preview"><wicket:message key="preview">Preview</wicket:message></a>
+       <a href="#" id="mainFormSubmit" onclick="document.forms['styleForm'].submit();">
-       <!--a href="#" wicket:id="submit"><wicket:message key="submit">Submit</wicket:message></a-->
+           <wicket:message key="submit">Submit</wicket:message>
-       <a href="#" id="mainFormSubmit" onclick="document.forms['mainForm'].submit();">
-         <wicket:message key="submit">Submit</wicket:message>
        </a>
        <a href="#" wicket:id="cancel"><wicket:message key="cancel">Cancel</wicket:message></a>
     </div>
-    <br/>
-    <div wicket:id="legendContainer">
-      <img wicket:id="legendImg"></img>
-    </div>
-
 </wicket:extend>
 </body>
 </html>