r80 - in trunk/vradi-web/src/main/webapp: WEB-INF/jsp css - Vradi-commits

31 May 2011

Author: sletellier
Date: 2011-05-31 16:37:54 +0200 (Tue, 31 May 2011)
New Revision: 80

Url: http://chorem.org/repositories/revision/vradi/80

Log:
Fix search.jsp layout



Modified:
   trunk/vradi-web/src/main/webapp/WEB-INF/jsp/search.jsp
   trunk/vradi-web/src/main/webapp/css/search.css

Modified: trunk/vradi-web/src/main/webapp/WEB-INF/jsp/search.jsp
===================================================================

--- trunk/vradi-web/src/main/webapp/WEB-INF/jsp/search.jsp	2011-05-31 12:46:45 UTC (rev 79)
+++ trunk/vradi-web/src/main/webapp/WEB-INF/jsp/search.jsp	2011-05-31 14:37:54 UTC (rev 80)
@@ -18,59 +18,76 @@
         <script type="text/javascript">
             $.subscribe('treeClicked', function(event, data) {
                 var item = event.originalEvent.data.rslt.obj;
-                $('#searchArea')[0].innerHTML += item.text().trim()
+                $('#searchArea')[0].innerHTML += item.text().trim();
             });
         </script>
     </head>
     <body>
-            <s:url id="thesaurusDataUrl" action="thesaurus"/>
-            <sjt:tree
-                id="thesaurus"
-                href="%{thesaurusDataUrl}"
-                onClickTopics="treeClicked"
-            />
+        <div>
+            <div id="thesaurusPanel" class="left">
+                <s:url id="thesaurusDataUrl" action="thesaurus"/>
+                <sjt:tree
+                        id="thesaurus"
+                        href="%{thesaurusDataUrl}"
+                        onClickTopics="treeClicked"/>
 
-        <s:form id="searchForm" action="search" method="post" theme="simple">
-            <s:select id="lastQueries"
-                      name="lastQueries"
-                      listKey="content"
-                      listValue="name"
-                      list="lastQueries"
-                      emptyOption="true"
-                      onchange="form.elements['query'].innerHTML = this.options[this.selectedIndex].value"/>
-            <s:text name="vradi.search.queryName"/>
-            <s:textfield id="queryName" name="queryName"/></br>
-            <s:textarea id="searchArea" name="query"/>
-            <s:submit key="vradi.search.saveQuery" name="saveRequest"/>
-            <s:if test="queryActive">
-                <s:submit key="vradi.search.unActivateQuery" name="switchUserQueryActivation"/>
-            </s:if>
-            <s:else>
-                <s:submit key="vradi.search.activateQuery" name="switchUserQueryActivation"/>
-            </s:else>
-            <s:submit key="vradi.search.submit" name="search"/>
-        </s:form>
-        <displaytag:table name="forms"
-                          sort="list"
-                          id="f"
-                          requestURI="search.action">
+            </div>
+            <div id="contentPanel">
+                <div id="searchPanel">
+                    <s:form id="searchForm" action="search" method="post" theme="simple">
+                        <s:select id="lastQueries"
+                                  name="lastQueries"
+                                  listKey="content"
+                                  listValue="name"
+                                  list="lastQueries"
+                                  emptyOption="true"
+                                  onchange="form.elements['query'].innerHTML = this.options[this.selectedIndex].value"/>
+                        <s:text name="vradi.search.queryName"/>
+                        <s:textfield id="queryName" name="queryName"/></br>
+                        <div id="queryPanel">
+                            <s:textarea id="searchArea"
+                                        name="query"
+                                        cols="160"
+                                        rows="4"/>
+                        </div>
+                        <div id="searchActionPanel">
+                            <s:submit key="vradi.search.saveQuery" name="saveRequest"/></br>
+                            <s:if test="queryActive">
+                                <s:submit key="vradi.search.unActivateQuery" name="switchUserQueryActivation"/>
+                            </s:if>
+                            <s:else>
+                                <s:submit key="vradi.search.activateQuery" name="switchUserQueryActivation"/>
+                            </s:else>
+                            </br>
+                            <s:submit key="vradi.search.submit" name="search"/>
+                        </div>
+                    </s:form>
+                </div>
+                <div id="resultPanel">
+                    <displaytag:table name="forms"
+                                      sort="list"
+                                      id="f"
+                                      requestURI="search.action">
 
-            <displaytag:column titleKey="vradi.form.creationDate"
-                               property="<%=Infogene.FIELD_INFOGENE_CREATIONDATE%>"
-                               sortable="true"
-                               sortProperty="<%=Infogene.FQ_FIELD_INFOGENE_CREATIONDATE%>"
-                               decorator="<%=DateFormatColumnDecorator.class.getName()%>"/>
+                        <displaytag:column titleKey="vradi.form.creationDate"
+                                           property="<%=Infogene.FIELD_INFOGENE_CREATIONDATE%>"
+                                           sortable="true"
+                                           sortProperty="<%=Infogene.FQ_FIELD_INFOGENE_CREATIONDATE%>"
+                                           decorator="<%=DateFormatColumnDecorator.class.getName()%>"/>
 
-            <displaytag:column titleKey="vradi.form.object"
-                               property="<%=Infogene.FIELD_INFOGENE_OBJET%>"
-                               sortable="true"
-                               sortProperty="<%=Infogene.FQ_FIELD_INFOGENE_OBJET%>"
-                               decorator="<%=EscapeScriptColomnDecorator.class.getName()%>"/>
+                        <displaytag:column titleKey="vradi.form.object"
+                                           property="<%=Infogene.FIELD_INFOGENE_OBJET%>"
+                                           sortable="true"
+                                           sortProperty="<%=Infogene.FQ_FIELD_INFOGENE_OBJET%>"
+                                           decorator="<%=EscapeScriptColomnDecorator.class.getName()%>"/>
 
-            <displaytag:column titleKey="common.action" class="action">
-                <s:set name="formNoteListURl"><%="formNoteList/" + ((Form)f).getWikittyId()%></s:set>
-                <s:a action="%{formNoteListURl}"><s:text name="vradi.search.formNoteEdit"/></s:a>
-            </displaytag:column>
-        </displaytag:table>
+                        <displaytag:column titleKey="common.action" class="action">
+                            <s:set name="formNoteListURl"><%="formNoteList/" + ((Form)f).getWikittyId()%></s:set>
+                            <s:a action="%{formNoteListURl}"><s:text name="vradi.search.formNoteEdit"/></s:a>
+                        </displaytag:column>
+                    </displaytag:table>
+                </div>
+            </div>
+        </div>
     </body>
 </html>
\ No newline at end of file

Modified: trunk/vradi-web/src/main/webapp/css/search.css
===================================================================
--- trunk/vradi-web/src/main/webapp/css/search.css	2011-05-31 12:46:45 UTC (rev 79)
+++ trunk/vradi-web/src/main/webapp/css/search.css	2011-05-31 14:37:54 UTC (rev 80)
@@ -1,4 +1,25 @@
+/* Layout */
+div.left{
+    float:left;
+}
 
+#searchActionPanel {
+    float:right;
+}
+
+#contentPanel {
+    padding-left: 10%;
+}
+
+#queryPanel {
+    float:left;
+    width: 85%;
+}
+
+textarea {
+    width: 100%;
+}
+
 /* Tableau */
 table {border-collapse:collapse; width: 100%;}
 .subTable th {font-weight: normal;}

    

r80 - in trunk/vradi-web/src/main/webapp: WEB-INF/jsp css

sletellier＠users.chorem.org

tags

participants (1)