* ajusted views of module 'convert'.

module/common/lang/zh-cn.php

@@ -404,32 +404,33 @@ $lang->datepicker->abbrDayNames = array('日', '一', '二', '三', '四', '五'
 $lang->datepicker->monthNames   = array('一月', '二月', '三月', '四月', '五月', '六月', '七月', '八月', '九月', '十月', '十一月', '十二月');
 
 /* Common action icons 通用动作图标 */
-$lang->icons['todo']    = 'checked';
-$lang->icons['product'] = 'cube';
-$lang->icons['bug']     = 'bug';
-$lang->icons['task']    = 'check-sign';
-$lang->icons['tasks']   = 'tasks';
-$lang->icons['project'] = 'folder-close-alt';
-$lang->icons['doc']     = 'file-text';
-$lang->icons['doclib']  = 'folder-close';
-$lang->icons['story']   = 'lightbulb';
-$lang->icons['release'] = 'tags';
-$lang->icons['roadmap'] = 'code-fork';
-$lang->icons['plan']    = 'flag';
-$lang->icons['dynamic'] = 'volume-up';
-$lang->icons['build']   = 'tag';
-$lang->icons['test']    = 'check';
-$lang->icons['testtask']= 'check';
-$lang->icons['group']   = 'group';
-$lang->icons['team']    = 'group';
-$lang->icons['company'] = 'building';
-$lang->icons['user']    = 'user';
-$lang->icons['dept']    = 'sitemap';
-$lang->icons['usecase'] = 'usecase';
-$lang->icons['testcase']= 'smile';
-$lang->icons['result']  = 'flag-checkered';
-$lang->icons['mail']    = 'envelope';
-$lang->icons['trash']   = 'trash';
+$lang->icons['todo']      = 'checked';
+$lang->icons['product']   = 'cube';
+$lang->icons['bug']       = 'bug';
+$lang->icons['task']      = 'check-sign';
+$lang->icons['tasks']     = 'tasks';
+$lang->icons['project']   = 'folder-close-alt';
+$lang->icons['doc']       = 'file-text';
+$lang->icons['doclib']    = 'folder-close';
+$lang->icons['story']     = 'lightbulb';
+$lang->icons['release']   = 'tags';
+$lang->icons['roadmap']   = 'code-fork';
+$lang->icons['plan']      = 'flag';
+$lang->icons['dynamic']   = 'volume-up';
+$lang->icons['build']     = 'tag';
+$lang->icons['test']      = 'check';
+$lang->icons['testtask']  = 'check';
+$lang->icons['group']     = 'group';
+$lang->icons['team']      = 'group';
+$lang->icons['company']   = 'building';
+$lang->icons['user']      = 'user';
+$lang->icons['dept']      = 'sitemap';
+$lang->icons['usecase']   = 'usecase';
+$lang->icons['testcase']  = 'smile';
+$lang->icons['result']    = 'flag-checkered';
+$lang->icons['mail']      = 'envelope';
+$lang->icons['trash']     = 'trash';
+$lang->icons['extension'] = 'th-large';
 
 $lang->icons['results']        = 'flag-checkered';
 $lang->icons['create']         = 'plus';

module/convert/lang/zh-cn.php

@@ -49,8 +49,8 @@ $lang->convert->sourceList['Redmine'] = array('Redmine_1.1' => '1.1');
 $lang->convert->setting     = '设置';
 $lang->convert->checkConfig = '检查配置';
 
-$lang->convert->ok          = '检查通过(√)';
-$lang->convert->fail        = '检查失败(×)';
+$lang->convert->ok          = '<span class="text-success"><i class="icon-ok-sign"></i> 检查通过</span>';
+$lang->convert->fail        = '<span class="text-danger"><i class="icon-remove-sign"></i> 检查失败</span>';
 
 $lang->convert->settingDB   = '设置数据库';
 $lang->convert->dbHost      = '数据库服务器';

module/convert/view/checkbugfree.html.php

@@ -1,5 +1,5 @@
 <tr>
-  <th><?php echo $lang->convert->checkDB;?></th>
+  <th class='w-100px'><?php echo $lang->convert->checkDB;?></th>
   <td><?php is_object($checkInfo['db']) ? printf($lang->convert->ok) : printf($lang->convert->fail);?></td>
 </tr>
 <!--
@@ -16,17 +16,19 @@
   <th><?php echo $lang->convert->checkPath;?></th>
   <td><?php $checkInfo['path'] === true ? printf($lang->convert->ok) : printf($lang->convert->fail);?></td>
 </tr>
-<tr>
-  <td colspan='2' class='text-center'>
-    <?php
-    if($result == 'pass')
-    {
-        echo html::hidden('source', $source) . html::hidden('version', $version) . html::submitButton($lang->convert->execute);
-    }
-    else
-    {
-        echo html::commonButton($lang->goback, 'onclick=history.back();');
-    }
-?>
-  </td>
-</tr>
+<tfoot>
+  <tr>
+    <td colspan='2' class='text-center'>
+      <?php
+      if($result == 'pass')
+      {
+          echo html::hidden('source', $source) . html::hidden('version', $version) . html::submitButton($lang->convert->execute);
+      }
+      else
+      {
+          echo html::commonButton($lang->goback, 'onclick=history.back();');
+      }
+  ?>
+    </td>
+  </tr>
+</tfoot>

module/convert/view/checkconfig.html.php

@@ -10,20 +10,31 @@
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
-<form method='post' action='<?php echo inlink('execute');?>'>
-<table align='center' class='w-p65 f-14px'>
-  <caption><?php echo $lang->convert->checkConfig . $lang->colon . strtoupper($source);?></caption>
-  <?php echo $checkResult;?>
-</table>
-<?php 
-echo html::hidden('dbHost',     $this->post->dbHost);
-echo html::hidden('dbPort',     $this->post->dbPort);
-echo html::hidden('dbUser',     $this->post->dbUser);
-echo html::hidden('dbPassword', $this->post->dbPassword);
-echo html::hidden('dbName',     $this->post->dbName);
-echo html::hidden('dbCharset',  $this->post->dbCharset);
-echo html::hidden('dbPrefix',   $this->post->dbPrefix);
-echo html::hidden('installPath',$this->post->installPath);
-?>
-</form>
+<div class='container mw-700px'>
+  <div id='titlebar'>
+    <div class='heading'>
+      <span class='prefix'><?php echo html::icon('cloud-upload');?></span>
+      <strong><?php echo $lang->convert->common;?></strong>
+      <small class='text-muted'><?php echo $lang->convert->checkConfig;?> </small>
+      <strong class='text-important'> <?php echo strtoupper($source);?></strong>
+    </div>
+  </div>
+  <form method='post' action='<?php echo inlink('execute');?>'>
+  <div class='alert'>
+    <table align='center' class='table table-data table-borderless'>
+      <?php echo $checkResult;?>
+    </table>
+  </div>
+  <?php 
+  echo html::hidden('dbHost',     $this->post->dbHost);
+  echo html::hidden('dbPort',     $this->post->dbPort);
+  echo html::hidden('dbUser',     $this->post->dbUser);
+  echo html::hidden('dbPassword', $this->post->dbPassword);
+  echo html::hidden('dbName',     $this->post->dbName);
+  echo html::hidden('dbCharset',  $this->post->dbCharset);
+  echo html::hidden('dbPrefix',   $this->post->dbPrefix);
+  echo html::hidden('installPath',$this->post->installPath);
+  ?>
+  </form>
+</div>
 <?php include '../../common/view/footer.html.php';?>

module/convert/view/execute.html.php

@@ -10,9 +10,17 @@
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
-<table align='center' class='f-14px'>
-  <caption><?php echo $lang->convert->execute . $lang->colon . strtoupper($source);?></caption>
-  <?php echo $executeResult;?>
-</table>
-</form>
+<div class='container mw-700px'>
+  <div id='titlebar'>
+    <div class='heading'>
+      <span class='prefix'><?php echo html::icon('cloud-upload');?></span>
+      <strong><?php echo $lang->convert->common;?></strong>
+      <small class='text-muted'><?php echo $lang->convert->execute;?> </small>
+      <strong class='text-important'> <?php echo strtoupper($source);?></strong>
+    </div>
+  </div>
+  <div class='alert'>
+    <?php echo $executeResult;?>
+  </div>
+</div>
 <?php include '../../common/view/footer.html.php';?>

module/convert/view/index.html.php

@@ -17,13 +17,11 @@
       <strong><?php echo $lang->convert->common;?></strong>
     </div>
   </div>
-  <div class='main pdt-20'>
-    <div class='alert'>
-      <div class='content'>
-        <?php echo nl2br($lang->convert->desc);?>
-        <div class='text-center pdt-20'>
-          <?php echo html::a($this->createLink('convert', 'selectsource'), '<i class="icon-exchange"></i> ' . $lang->convert->start, '', 'class="btn btn-primary"');?>
-        </div>
+  <div class='alert'>
+    <div class='content'>
+      <?php echo nl2br($lang->convert->desc);?>
+      <div class='text-center pdt-20'>
+        <?php echo html::a($this->createLink('convert', 'selectsource'), '<i class="icon-exchange"></i> ' . $lang->convert->start, '', 'class="btn btn-primary"');?>
       </div>
     </div>
   </div>

module/custom/css/common.css

@@ -1,3 +0,0 @@
-.list-group-item {padding: 8px 15px}
-.list-group-item.active,.list-group-item.active:hover {background: #fff; border-color: #ddd; background: #f1f1f1; color: #333; font-weight: bold;}
-.list-group-item.active > a {color: #333}

www/theme/default/style.css

@@ -23,6 +23,7 @@
 /* paddings */
 .pd-0 {padding: 0 !important}
 .mg-0 {margin: 0 !important}
+.mgb-20 {margin-bottom: 20px !important}
 .pdb-20 {padding-bottom: 20px !important}
 .pdt-20 {padding-top: 20px !important}
 
@@ -285,8 +286,15 @@ div.form-control[contenteditable='true'] {height: auto; text-align: left; outlin
 .panel .table-bordered tr > td:first-child,.panel .table-bordered tr > th:first-child {border-left: 0;}
 .panel .table-bordered tr > td:last-child,.panel .table-bordered tr > th:last-child {border-right: 0;}
 
+/* small panel */
 .panel-sm .panel-heading {padding: 6px 10px}
 
+/* list group */
+.list-group-item {padding: 8px 15px}
+.list-group-item.active,.list-group-item.active:hover {background: #fff; border-color: #ddd; background: #f1f1f1; color: #333; font-weight: bold;}
+.list-group-item.active > a {color: #333}
+
+
 /* File form */
 .fileBox {margin-bottom: 10px; width: 100%}
 #fileform > .fileBox:last-child {margin-bottom: 0;}