- A bit more of styling... working on "New" move

naturalsciences · Feb 4, 2010 · 8c75be8 · 8c75be8
1 parent db7c65f
commit 8c75be8
Show file tree

Hide file tree

Showing 4 changed files with 58 additions and 13 deletions.
diff --git a/apps/frontend/modules/expedition/templates/_searchForm.php b/apps/frontend/modules/expedition/templates/_searchForm.php
@@ -12,6 +12,7 @@
              success: function(html){
                                      $(".search_results_content").html(html);
                                      $('.search_results').slideDown();
+                                     $(".search_new_link_line").hide();
                                     }
             }
            );
@@ -71,6 +72,12 @@
         <td><?php echo $form['expedition_to_date']->render() ?></td>
         <td><input class="search_submit" type="submit" name="search" value="<?php echo __('Search'); ?>" /></td>
       </tr>
+      <tr class="search_new_link_line">
+        <td></td>
+        <td></td>
+        <td></td>
+        <td><div class='new_link'><a href="<?php echo url_for('expedition/new') ?>"><?php echo __('New');?></a></div></td>
+      </tr>
     </tbody>
   </table>
   <div class="search_results">

diff --git a/apps/frontend/modules/expedition/templates/indexSuccess.php b/apps/frontend/modules/expedition/templates/indexSuccess.php
@@ -2,8 +2,4 @@
 <div class="page">
   <h1><?php echo __('Expedition List');?></h1>
   <?php include_partial('searchForm', array('form' => $form, 'is_choose' => false)) ?>
-  <br /><br />
-  <div class='new_link'>
-    <a href="<?php echo url_for('expedition/new') ?>"><?php echo __('New');?></a>
-  </div>
 </div>
diff --git a/apps/frontend/modules/expedition/templates/searchSuccess.php b/apps/frontend/modules/expedition/templates/searchSuccess.php
@@ -89,10 +89,26 @@
             </tr>
           <?php endforeach;?>
         </tbody>
+        <tfoot>
+          <tr>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td><div class='new_link'><a href="<?php echo url_for('expedition/new') ?>"><?php echo __('New');?></a></div></td>
+          </tr>
+        </tfoot>
       </table>
     </div>
   <?php else:?>
-    <?php echo __('No Expedition Matching');?>
+    <div class='is_choose_<?php echo $is_choose ?>'>
+      <table>
+        <tbody>
+          <tr>
+            <td><?php echo __('No Expedition Matching');?></td>
+          </tr>
+        </tbody>
+      </table>
+    </div>
   <?php endif;?>
 <?php else:?>
   <div class="error">

diff --git a/web/css/main.css b/web/css/main.css
@@ -36,6 +36,14 @@ table td
   margin-right: 51px;
 }
 
+.qtip-content .page
+{
+  margin-top: 15px;
+  margin-left:0;
+  margin-right:0;
+  min-width:720px;
+}
+
 .hidden
 {
   display:none;
@@ -170,7 +178,9 @@ a.but_text
 form th, form tr > td
 {
   text-align:left;
-  padding: 0.5em;
+  padding-top: 0.5em;
+  padding-bottom: 0.5em;
+  padding-right: 0.5em;
 }
 
 /** Forms - Search **/
@@ -200,17 +210,22 @@ form th, form tr > td
   cursor:pointer;
 }
 
-table#search_and_choose
+/*table#search_and_choose
 {
   width: 100%;
-}
+}*/
 
 .button 
 {
   line-height:24px;
   float:left;
 }
 
+.ui-datepicker-trigger
+{
+  vertical-align:text-bottom;
+}
+
 input[type="submit"][class="search_submit"]
 {
   background: white url(/images/widget_button.png) no-repeat;
@@ -253,7 +268,7 @@ input[type="submit"][class="search_submit"]:hover
 .pager
 {
   margin-bottom:0.3em;
-  padding-left:0.7em;
+/*  padding-left:0.7em;*/
 }
 
 .pager li
@@ -292,15 +307,16 @@ input[type="submit"][class="search_submit"]:hover
 {
   background-color:white;
   width:60%;
-  margin-left: 0.51em;
-  border: 1px solid #5BAABD;
   -moz-border-radius: 5px;
   -webkit-border-radius: 5px;
   vertical-align: middle;
 }
 
 .results thead
 {
+  border-top: 1px solid #5BAABD;
+  border-left: 1px solid #5BAABD;
+  border-right: 1px solid #5BAABD;
   background-color: #5BAABD;
   text-align: left;
   color: white;
@@ -317,6 +333,11 @@ input[type="submit"][class="search_submit"]:hover
   text-decoration:underline;
 }
 
+.results tbody
+{
+  border: 1px solid #5BAABD;
+}
+
 .results tbody tr:hover
 {
   background-color:#D5DEE3;
@@ -326,6 +347,12 @@ input[type="submit"][class="search_submit"]:hover
 {
   padding-top: 0.2em;
   padding-bottom: 0.2em;
+  padding-left:0.2em;
+}
+
+.results tfoot td
+{
+  padding-right:0;
 }
 
 .is_choose_1 table, table.is_choose
@@ -411,7 +438,6 @@ input[type="submit"][class="search_submit"]:hover
 .new_link
 {
   float:right;
-  margin-right:39.3%;
   background: white url(/images/widget_button.png) no-repeat;
   height:22px;
   width:74px;
@@ -527,7 +553,6 @@ table.encoding thead
 table.encoding thead th
 {
   font-weight: normal;
-/*   text-align: center; */
 }
 
 table.encoding tbody
@@ -660,6 +685,7 @@ form.edition, form.renamed, .edit_syn_screen
   border:1px solid #C1CC33;
   -moz-border-radius: 5px;
   -webkit-border-radius: 5px;
+  padding-left:0.5em;
 }
 
 .edit_syn_screen