From 459e3e64fcc478c84ecb7edff53ca7bf4b8d4e54 Mon Sep 17 00:00:00 2001
From: wyd621 <wyd621@163.com>
Date: Wed, 30 Oct 2013 03:11:59 +0000
Subject: [PATCH]  * adjust pager style.

---
 module/webapp/css/common.css       |  5 ++--
 module/webapp/view/index.html.php  | 40 ++++++++++++++------------
 module/webapp/view/obtain.html.php | 46 ++++++++++++++++--------------
 3 files changed, 48 insertions(+), 43 deletions(-)

diff --git a/module/webapp/css/common.css b/module/webapp/css/common.css
index 35ec9d3510..54d181c8e3 100644
--- a/module/webapp/css/common.css
+++ b/module/webapp/css/common.css
@@ -12,8 +12,9 @@
 #webapps li {float:left; width:25%; list-style:none}
 #webapps li table {border:0px; width:95%; border:1px solid #ddd;}
 #webapps li table .webapp-name{font-size:14px; color:#039; padding-top:2px;}
-#webapps li table .webapp-icon{padding:5px;}
+#webapps li table .webapp-icon{padding:5px;vertical-align:middle;text-align:center}
 #webapps li table .webapp-info{color:#888; padding-top:2px; height:32px; white-space:pre-wrap;}
+#webapps li table .webapp-actions{padding-top:5px}
 
 small{font-weight:normal}
-#webapps .button-c{min-width: 0;}
\ No newline at end of file
+#webapps .button-c{min-width: 0;}
diff --git a/module/webapp/view/index.html.php b/module/webapp/view/index.html.php
index 516c7e7183..afe6707167 100644
--- a/module/webapp/view/index.html.php
+++ b/module/webapp/view/index.html.php
@@ -26,25 +26,27 @@
             <tr><td valign='top'><div class='webapp-info' title='<?php echo $webapp->abstract?>'><?php echo empty($webapp->abstract) ? '&nbsp;' : $webapp->abstract?></div></td></tr>
             <tr>
               <td>
-              <?php
-              $url     = $webapp->addType == 'custom' ? $webapp->url : $config->webapp->url . "/webapp-showapp-{$webapp->appid}.html";
-              $method  = '';
-              $popup   = '';
-              $target  = '_self';
-              if($webapp->target == 'blank') $target   = '_blank';
-              if($webapp->target == 'iframe')$method   = "toggleShowapp($webapp->id, \"$webapp->name\");";
-              if($webapp->target == 'popup')
-              {
-                  $width  = 0;
-                  $height = 0;
-                  if($webapp->size) list($width, $height) = explode('x', $webapp->size);
-                  $method = "popup($width, $height);";
-                  $popup  = 'popup';
-              }
-              echo html::a($url, $lang->webapp->useapp, $target,  "id='useapp$webapp->id' class='button-c $popup' onclick='addView($webapp->id);$method'");
-              common::printLink('webapp', 'view', "webappID=$webapp->id", $lang->webapp->view, '',  "class='button-c webapp'");
-              common::printLink('webapp', 'uninstall',  "webapp=$webapp->id", $lang->webapp->uninstall, 'hiddenwin',  "class='button-c'");
-              ?>
+                <div class='webapp-actions'>
+                  <?php
+                  $url     = $webapp->addType == 'custom' ? $webapp->url : $config->webapp->url . "/webapp-showapp-{$webapp->appid}.html";
+                  $method  = '';
+                  $popup   = '';
+                  $target  = '_self';
+                  if($webapp->target == 'blank') $target   = '_blank';
+                  if($webapp->target == 'iframe')$method   = "toggleShowapp($webapp->id, \"$webapp->name\");";
+                  if($webapp->target == 'popup')
+                  {
+                      $width  = 0;
+                      $height = 0;
+                      if($webapp->size) list($width, $height) = explode('x', $webapp->size);
+                      $method = "popup($width, $height);";
+                      $popup  = 'popup';
+                  }
+                  echo html::a($url, $lang->webapp->useapp, $target,  "id='useapp$webapp->id' class='button-c $popup' onclick='addView($webapp->id);$method'");
+                  common::printLink('webapp', 'view', "webappID=$webapp->id", $lang->webapp->view, '',  "class='button-c webapp'");
+                  common::printLink('webapp', 'uninstall',  "webapp=$webapp->id", $lang->webapp->uninstall, 'hiddenwin',  "class='button-c'");
+                  ?>
+                </div>
               </td>
             </tr>
           </table>
diff --git a/module/webapp/view/obtain.html.php b/module/webapp/view/obtain.html.php
index 53e9b47d67..7d809c0fcf 100644
--- a/module/webapp/view/obtain.html.php
+++ b/module/webapp/view/obtain.html.php
@@ -48,28 +48,30 @@
             <tr><td valign='top'><div class='webapp-info' title='<?php echo $webapp->abstract?>'><?php echo empty($webapp->abstract) ? '&nbsp;' : $webapp->abstract?></div></td></tr>
             <tr>
               <td>
-              <?php
-                $url     = $webapp->url;
-                $method  = '';
-                $popup   = '';
-                $target  = '_self';
-                if($webapp->target == 'popup')
-                {
-                    $width  = 0;
-                    $height = 0;
-                    if($webapp->size) list($width, $height) = explode('x', $webapp->size);
-                    $method = "popup($width, $height);";
-                    $popup  = 'popup';
-                }
-                else
-                {
-                    $method = "popup(1024, 600);";
-                    $popup  = 'popup';
-                }
-                echo isset($installeds[$webapp->id]) ? html::commonButton($lang->webapp->installed, "disabled='disabled' style='color:gray'") : html::a(inLink('install', "webappID={$webapp->id}"), $lang->webapp->install, '_self', "class='button-c iframe'");
-                common::printLink('webapp', 'view', "webappID=$webapp->id&type=api", $lang->webapp->view, '',  "class='button-c apiapp'");
-                echo html::a($url, $lang->webapp->preview, '', "id='useapp$webapp->id' class='button-c $popup' onclick='$method'");
-              ?>
+                <div class='webapp-actions'>
+                  <?php
+                  $url     = $webapp->url;
+                  $method  = '';
+                  $popup   = '';
+                  $target  = '_self';
+                  if($webapp->target == 'popup')
+                  {
+                      $width  = 0;
+                      $height = 0;
+                      if($webapp->size) list($width, $height) = explode('x', $webapp->size);
+                      $method = "popup($width, $height);";
+                      $popup  = 'popup';
+                  }
+                  else
+                  {
+                      $method = "popup(1024, 600);";
+                      $popup  = 'popup';
+                  }
+                  echo isset($installeds[$webapp->id]) ? html::commonButton($lang->webapp->installed, "disabled='disabled' style='color:gray'") : html::a(inLink('install', "webappID={$webapp->id}"), $lang->webapp->install, '_self', "class='button-c iframe'");
+                  common::printLink('webapp', 'view', "webappID=$webapp->id&type=api", $lang->webapp->view, '',  "class='button-c apiapp'");
+                  echo html::a($url, $lang->webapp->preview, '', "id='useapp$webapp->id' class='button-c $popup' onclick='$method'");
+                  ?>
+                </div>
               </td>
             </tr>
           </table>