* ajusted views of module 'install', 'upgrade'.

* fixed css selector when call chosen method.
2014-04-11 17:04:27 +08:00
parent 43e6844ccf
commit 388dcbd8ec
23 changed files with 444 additions and 321 deletions
@@ -26,7 +26,7 @@ function loadProjectBuilds(productID, projectID, index)
    $.get(link, function(builds)
    {
        $('#buildBox' + index).html(builds);
-        $('#openedBuilds' + index + '_chzn').remove();
+        $('#openedBuilds' + index + '_chosen').remove();
        $('#buildBox' + index + ' select').removeClass('select-3');
        $('#buildBox' + index + ' select').addClass('select-1');
        $('#buildBox' + index + ' select').attr('id', 'openedBuilds[' + index + '][]');
@@ -218,7 +218,7 @@ function setStories(moduleID, productID)
    {
        if(!stories) stories = '<select id="story" name="story" class="form-control"></select>';
        $('#story').replaceWith(stories);
-        $('#story_chzn').remove();
+        $('#story_chosen').remove();
        $("#story").chosen({no_results_text: ''});
    });
 }
@@ -11,7 +11,8 @@
 /* debug panel */
 #debugPanel {width: 160px; height: 40px; background: rgba(255,255,255,0.8); float: left; transition:all 0.3s;}
 #debugPanel.show {width: 600px; height: 540px; position: relative; top: -500px; box-shadow: 2px 2px 5px rgba(0,0,0,0.25); background: #fff}
-#debugPanel > header {color: #fff; padding: 0 15px; background: rgba(0,0,0,0.8); cursor: pointer; transition: all 0.5s;}
+body > #debugPanel, body > #debugPanel.show {position: fixed; bottom: 0; top: inherit;} 
+#debugPanel > header {color: #fff; padding: 0 15px; background: rgba(0,0,0,0.8); cursor: pointer; transition: all 0.5s; line-height: 40px}
 #debugPanel.with-content > header {background: #D2322D}
 #debugPanel > header > .icon {display: inline-block; border-radius: 4px; background: #ddd; background: rgba(255,255,255,0.3); padding: 2px 5px; margin-right: 5px;}
 #debugHandle {color: #ddd}
@@ -38,7 +38,7 @@
      </tr>  
      <?php endif;?>
      <tr>
-        <th><?php echo $lang->doc->module;?></th>
+        <th class='w-80px'><?php echo $lang->doc->module;?></th>
        <td><?php echo html::select('module', $moduleOptionMenu, $moduleID, "class='form-control'");?></td>
      </tr>  
      <tr>
@@ -1,5 +1,15 @@
-body{background:white; margin-top:50px}
-caption, th, td {padding:10px; font-size:16px}
+body{background: #f1f1f1;}
+.container{padding: 0}
+.modal-dialog{width: 800px}
+.modal-footer{text-align: center;margin-top: 0;}
+
+.table,.alert{margin: 0;}
+.table+.alert{margin-top: 20px;}
+.table.table-form>thead>tr>th, .table.table-form>tbody>tr>th, .table.table-form>tfoot>tr>th{color: #666}
+.table>thead>tr>th{background-color: transparent;}
+.table.table-form>thead>tr>th, .table.table-form>tbody>tr>th, .table.table-form>tfoot>tr>th, .table.table-form>thead>tr>td, .table.table-form>tbody>tr>td, .table.table-form>tfoot>tr>td{vertical-align: middle;}
+
+@media (max-width: 700px){.modal-dialog{padding: 0;} .modal-content{box-shadow: none;border-width: 1px 0;border-radius: 0}}
+
 .ok{background:green; color:white}
 .fail{background:red; color:white}
-th{text-align:right}
@@ -0,0 +1,8 @@
+h3{font-size:16px; margin-bottom: 20px;}
+blockquote{padding: 0; border-left: 0;}
+li{line-height: 2em}
+.modal-dialog{position: relative; line-height: 20px}
+.modal-header{position: absolute; right: 15px; top: 10px; border: none;z-index: 999}
+.modal-body{padding: 20px 60px;}
+
+.dropdown-menu {min-width: 120px; margin-top: 0;}
@@ -26,17 +26,18 @@ $lang->install->desc             = <<<EOT

 禅道项目管理软件使用PHP + MySQL开发，基于自主的PHP开发框架──ZenTaoPHP而成。第三方开发者或者企业可以非常方便的开发插件或者进行定制。

-禅道项目管理软件由<strong><a href='http://www.cnezsoft.com' target='_blank' class='red'>青岛易软天创网络科技有限公司</a>开发</strong>。
+禅道项目管理软件由<strong><a href='http://www.cnezsoft.com' target='_blank' class='text-danger'>青岛易软天创网络科技有限公司</a>开发</strong>。
 官方网站：<a href='http://www.zentao.net' target='_blank'>http://www.zentao.net</a>
 技术支持: <a href='http://www.zentao.net/ask/' target='_blank'>http://www.zentao.net/ask/</a>
 新浪微博：<a href='http://t.sina.com.cn/zentaopms' target='_blank'>t.sina.com.cn/zentaopms</a>
 腾讯微博：<a href='http://t.qq.com/zentaopms/' target='_blank'>t.qq.com/zentaopms</a>

-您现在正在安装的版本是 <strong class='red'>%s</strong>。
+您现在正在安装的版本是 <strong class='text-danger'>%s</strong>。
 EOT;

-$lang->install->newReleased= "<strong class='red'>提示</strong>：官网网站已有最新版本<strong class='red'>%s</strong>, 发布日期于 %s。";
+$lang->install->newReleased= "<strong class='text-danger'>提示</strong>：官网网站已有最新版本<strong class='text-danger'>%s</strong>, 发布日期于 %s。";
 $lang->install->choice     = '您可以选择：';
+$lang->install->or         = '或者';
 $lang->install->checking   = '系统检查';
 $lang->install->ok         = '检查通过(√)';
 $lang->install->fail       = '检查失败(×)';
@@ -128,8 +129,10 @@ $lang->install->groupList['OTHERS']['name'] = '其他';
 $lang->install->groupList['OTHERS']['desc'] = '其他';

 $lang->install->success = "安装成功";
+$lang->install->login   = '登录禅道管理系统';
+$lang->install->regist  = '禅道社区注册';

 $lang->install->joinZentao = <<<EOT
-您已经成功安装禅道管理系统%s，<strong class='red'>请及时删除install.php</strong>。现在您可以直接<input type='button' value='登录禅道管理系统' onclick='location.href="index.php"'>，设置用户及分组！
-<i>友情提示：为了您及时获得禅道的最新动态，请在禅道社区(<a href='http://www.zentao.net' target='_blank'>www.zentao.net</a>)进行登记。</i>
+<p>您已经成功安装禅道管理系统%s，<strong class='text-danger'>请及时删除install.php</strong>。现在您可以直接 <a class='alert-link' href="index.php">登录禅道管理系统</a>，设置用户及分组！</p>
+<p>友情提示：为了您及时获得禅道的最新动态，请在禅道社区(<a href='http://www.zentao.net' class='alert-link' target='_blank'>www.zentao.net</a>)进行登记。</p>
 EOT;
@@ -10,27 +10,42 @@
 */
 ?>
 <?php include '../../common/view/header.lite.html.php';?>
-<table align='center' class='table-6'>
-  <caption><?php echo $lang->install->welcome;?></caption>
-  <tr><td><?php echo nl2br(sprintf($lang->install->desc, $config->version));?></td></tr>
-  <tr>
-    <td>
-    <?php if(isset($latestRelease) and (version_compare($latestRelease->version, $config->version) > 0)):?>
-    <?php vprintf($lang->install->newReleased, $latestRelease);?>
-    <h3 class='text-center'>
-      <?php 
-      echo $lang->install->choice;
-      echo html::a($latestRelease->url, $lang->install->seeLatestRelease, '_blank');
-      echo html::a($this->createLink('install', 'step1'), $lang->install->keepInstalling);
-      ?>
-    </h3>
-	<?php else:?>
-      <h3 class='text-center'>
-        <?php echo html::select('', $app->config->langs, $app->cookie->lang,  'onchange="selectLang(this.value)"');?>
-        <?php echo html::a($this->createLink('install', 'step1'), $lang->install->start);?>
-      </h3>
-    <?php endif;?>
-    </td>
-  </tr>
-</table>
+<div class='container'>
+  <div class='modal-dialog'>
+    <div class='modal-header'>
+      <div class='btn-group'>
+        <button type='button' class='btn dropdown-toggle' data-toggle='dropdown'><?php echo $app->config->langs[$app->cookie->lang];?> <span class='caret'></span></button>
+        <ul class='dropdown-menu'>
+        <?php
+        foreach ($app->config->langs as $key => $value)
+        {
+            if($key == $app->cookie->lang) continue;
+            echo '<li>' . html::a('javascript:selectLang("' . $key . '")', $value) . '</li>';
+        }
+        ?>
+        </ul>
+      </div>
+    </div>
+    <div class='modal-body'>
+      <h3><?php echo $lang->install->welcome;?></h3>
+      <div><?php echo nl2br(sprintf($lang->install->desc, $config->version));?></div>
+    </div>
+    <div class='modal-footer'>
+      <?php if(isset($latestRelease) and (version_compare($latestRelease->version, $config->version) > 0)):?>
+      <div class='mgb-20'><?php vprintf($lang->install->newReleased, $latestRelease);?></div>
+      <div class='form-group'>
+        <?php 
+        echo html::a($latestRelease->url, $lang->install->seeLatestRelease, '_blank', "class='btn btn-success'");
+        echo "<span class='text-muted'> &nbsp; " . $lang->install->or . ' &nbsp; </span>';
+        echo html::a($this->createLink('install', 'step1'), $lang->install->keepInstalling, '', "class='btn btn-primary'");
+        ?>
+      </div>
+      <?php else:?>
+      <div class='form-group'>
+        <?php echo html::a($this->createLink('install', 'step1'), $lang->install->start, '', "class='btn btn-primary'");?>
+      </div>
+      <?php endif;?>
+    </div>
+  </div>
+</div>
 <?php include '../../common/view/footer.lite.html.php';?>
@@ -10,112 +10,119 @@
 */
 ?>
 <?php include '../../common/view/header.lite.html.php';?>
-<table align='center' class='table-6 a-center'>
-  <caption><?php echo $lang->install->checking;?></caption>
-  <tr>
-    <th class='w-p20 a-center'><?php echo $lang->install->checkItem;?></th>
-    <th class='w-p25 a-center'><?php echo $lang->install->current?></th>
-    <th class='w-p15 a-center'><?php echo $lang->install->result?></th>
-    <th class="a-center"><?php echo $lang->install->action?></th>
-  </tr>
-  <tr>
-    <th><?php echo $lang->install->phpVersion;?></th>
-    <td><?php echo $phpVersion;?></td>
-    <td class='<?php echo $phpResult;?>'><?php echo $lang->install->$phpResult;?></td>
-    <td class='a-left f-12px'><?php if($phpResult == 'fail') echo $lang->install->phpFail;?></td>
-  </tr>
-  <tr>
-    <th><?php echo $lang->install->pdo;?></th>
-    <td><?php $pdoResult == 'ok' ? printf($lang->install->loaded) : printf($lang->install->unloaded);?></td>
-    <td class='<?php echo $pdoResult;?>'><?php echo $lang->install->$pdoResult;?></td>
-    <td class='a-left f-12px'><?php if($pdoResult == 'fail') echo $lang->install->pdoFail;?></td>
-  </tr>
-  <tr>
-    <th><?php echo $lang->install->pdoMySQL;?></th>
-    <td><?php $pdoMySQLResult == 'ok' ? printf($lang->install->loaded) : printf($lang->install->unloaded);?></td>
-    <td class='<?php echo $pdoMySQLResult;?>'><?php echo $lang->install->$pdoMySQLResult;?></td>
-    <td class='a-left f-12px'><?php if($pdoMySQLResult == 'fail') echo $lang->install->pdoMySQLFail;?></td>
-  </tr>
-  <tr>
-    <th><?php echo $lang->install->json;?></th>
-    <td><?php $jsonResult == 'ok' ? printf($lang->install->loaded) : printf($lang->install->unloaded);?></td>
-    <td class='<?php echo $jsonResult;?>'><?php echo $lang->install->$jsonResult;?></td>
-    <td class='a-left f-12px'><?php if($jsonResult == 'fail') echo $lang->install->jsonFail;?></td>
-  </tr>
-  <tr>
-    <th><?php echo $lang->install->tmpRoot;?></th>
-    <td>
+<div class='container'>
+  <div class='modal-dialog'>
+    <div class='modal-header'><strong><?php echo $lang->install->checking;?></strong></div>
+    <div class='modal-body'>
+      <table class='table table-bordered'>
+        <thead>
+          <tr class='text-center'>
+            <th class='w-p20'><?php echo $lang->install->checkItem;?></th>
+            <th class='w-p25'><?php echo $lang->install->current?></th>
+            <th class='w-p15'><?php echo $lang->install->result?></th>
+            <th><?php echo $lang->install->action?></th>
+          </tr>
+        </thead>
+        <tr>
+          <th><?php echo $lang->install->phpVersion;?></th>
+          <td><?php echo $phpVersion;?></td>
+          <td class='<?php echo $phpResult;?>'><?php echo $lang->install->$phpResult;?></td>
+          <td class='a-left f-12px'><?php if($phpResult == 'fail') echo $lang->install->phpFail;?></td>
+        </tr>
+        <tr>
+          <th><?php echo $lang->install->pdo;?></th>
+          <td><?php $pdoResult == 'ok' ? printf($lang->install->loaded) : printf($lang->install->unloaded);?></td>
+          <td class='<?php echo $pdoResult;?>'><?php echo $lang->install->$pdoResult;?></td>
+          <td class='a-left f-12px'><?php if($pdoResult == 'fail') echo $lang->install->pdoFail;?></td>
+        </tr>
+        <tr>
+          <th><?php echo $lang->install->pdoMySQL;?></th>
+          <td><?php $pdoMySQLResult == 'ok' ? printf($lang->install->loaded) : printf($lang->install->unloaded);?></td>
+          <td class='<?php echo $pdoMySQLResult;?>'><?php echo $lang->install->$pdoMySQLResult;?></td>
+          <td class='a-left f-12px'><?php if($pdoMySQLResult == 'fail') echo $lang->install->pdoMySQLFail;?></td>
+        </tr>
+        <tr>
+          <th><?php echo $lang->install->json;?></th>
+          <td><?php $jsonResult == 'ok' ? printf($lang->install->loaded) : printf($lang->install->unloaded);?></td>
+          <td class='<?php echo $jsonResult;?>'><?php echo $lang->install->$jsonResult;?></td>
+          <td class='a-left f-12px'><?php if($jsonResult == 'fail') echo $lang->install->jsonFail;?></td>
+        </tr>
+        <tr>
+          <th><?php echo $lang->install->tmpRoot;?></th>
+          <td>
+            <?php
+            $tmpRootInfo['exists']   ? print($lang->install->exists)   : print($lang->install->notExists);
+            $tmpRootInfo['writable'] ? print($lang->install->writable) : print($lang->install->notWritable);
+            ?>
+          </td>
+          <td class='<?php echo $tmpRootResult;?>'><?php echo $lang->install->$tmpRootResult;?></td>
+          <td class='a-left f-12px'>
+            <?php 
+            if(!$tmpRootInfo['exists'])   printf($lang->install->mkdir, $tmpRootInfo['path'], $tmpRootInfo['path']);
+            if(!$tmpRootInfo['writable']) printf($lang->install->chmod, $tmpRootInfo['path'], $tmpRootInfo['path']);
+            ?>
+          </td>
+        </tr>
+        <tr>
+          <th><?php echo $lang->install->dataRoot;?></th>
+          <td>
+            <?php
+            $dataRootInfo['exists']   ? print($lang->install->exists)   : print($lang->install->notExists);
+            $dataRootInfo['writable'] ? print($lang->install->writable) : print($lang->install->notWritable);
+            ?>
+          </td>
+          <td class='<?php echo $dataRootResult;?>'><?php echo $lang->install->$dataRootResult;?></td>
+          <td class='a-left f-12px'>
+            <?php 
+            if(!$dataRootInfo['exists'])   printf($lang->install->mkdir, $dataRootInfo['path'], $dataRootInfo['path']);
+            if(!$dataRootInfo['writable']) printf($lang->install->chmod, $dataRootInfo['path'], $dataRootInfo['path']);
+            ?>
+          </td>
+        </tr>
+        <?php if(preg_match('/WIN/i', PHP_OS)):?>
+        <tr>
+          <th><?php echo $lang->install->session;?></th>
+          <td>
+            <?php
+            $sessionInfo['exists']   ? print($lang->install->exists)   : print($lang->install->notExists);
+            $sessionInfo['writable'] ? print($lang->install->writable) : print($lang->install->notWritable);
+            ?>
+          </td>
+          <td class='<?php echo $sessionResult;?>'><?php echo $lang->install->$sessionResult;?></td>
+          <td class='a-left f-12px'>
+            <?php 
+            if($sessionInfo['path'])
+            {
+                if(!$sessionInfo['exists'])   printf($lang->install->mkdir, $sessionInfo['path'], $sessionInfo['path']);
+                if(!$sessionInfo['writable']) printf($lang->install->chmod, $sessionInfo['path'], $sessionInfo['path']);
+            }
+            else
+            {
+                echo $lang->install->sessionFail; 
+            }
+            ?>
+          </td>
+        </tr>
+        <?php endif;?>
+      </table>
+    </div>
+    <div class='modal-footer'>
      <?php
-      $tmpRootInfo['exists']   ? print($lang->install->exists)   : print($lang->install->notExists);
-      $tmpRootInfo['writable'] ? print($lang->install->writable) : print($lang->install->notWritable);
-      ?>
-    </td>
-    <td class='<?php echo $tmpRootResult;?>'><?php echo $lang->install->$tmpRootResult;?></td>
-    <td class='a-left f-12px'>
-      <?php 
-      if(!$tmpRootInfo['exists'])   printf($lang->install->mkdir, $tmpRootInfo['path'], $tmpRootInfo['path']);
-      if(!$tmpRootInfo['writable']) printf($lang->install->chmod, $tmpRootInfo['path'], $tmpRootInfo['path']);
-      ?>
-    </td>
-  </tr>
-  <tr>
-    <th><?php echo $lang->install->dataRoot;?></th>
-    <td>
-      <?php
-      $dataRootInfo['exists']   ? print($lang->install->exists)   : print($lang->install->notExists);
-      $dataRootInfo['writable'] ? print($lang->install->writable) : print($lang->install->notWritable);
-      ?>
-    </td>
-    <td class='<?php echo $dataRootResult;?>'><?php echo $lang->install->$dataRootResult;?></td>
-    <td class='a-left f-12px'>
-      <?php 
-      if(!$dataRootInfo['exists'])   printf($lang->install->mkdir, $dataRootInfo['path'], $dataRootInfo['path']);
-      if(!$dataRootInfo['writable']) printf($lang->install->chmod, $dataRootInfo['path'], $dataRootInfo['path']);
-      ?>
-    </td>
-  </tr>
-  <?php if(preg_match('/WIN/i', PHP_OS)):?>
-  <tr>
-    <th><?php echo $lang->install->session;?></th>
-    <td>
-      <?php
-      $sessionInfo['exists']   ? print($lang->install->exists)   : print($lang->install->notExists);
-      $sessionInfo['writable'] ? print($lang->install->writable) : print($lang->install->notWritable);
-      ?>
-    </td>
-    <td class='<?php echo $sessionResult;?>'><?php echo $lang->install->$sessionResult;?></td>
-    <td class='a-left f-12px'>
-      <?php 
-      if($sessionInfo['path'])
+      if($phpResult == 'ok' and $pdoResult == 'ok' and $pdoMySQLResult == 'ok' and $tmpRootResult == 'ok' and $dataRootResult == 'ok' and $sessionResult == 'ok')
      {
-          if(!$sessionInfo['exists'])   printf($lang->install->mkdir, $sessionInfo['path'], $sessionInfo['path']);
-          if(!$sessionInfo['writable']) printf($lang->install->chmod, $sessionInfo['path'], $sessionInfo['path']);
+          echo html::a($this->createLink('install', 'step2'), $lang->install->next, '', "class='btn btn-primary'");
      }
      else
      {
-          echo $lang->install->sessionFail; 
+          echo html::a($this->createLink('install', 'step1'), $lang->install->reload, '', "class='btn btn-primary mgb-20'");
+          if($pdoResult == 'fail' or $pdoMySQLResult == 'fail')
+          {
+            echo '<div class="panel panel-sm text-left"><div class="panel-heading strong">' . $lang->install->phpINI . '</div><div class="panel-body">' . nl2br($this->install->getIniInfo()) . '</div></div>';
+          }
      }
-      ?>
-    </td>
-  </tr>
-  <?php endif;?>
-  <tr>
-    <td colspan='4'>
-    <?php
-    if($phpResult == 'ok' and $pdoResult == 'ok' and $pdoMySQLResult == 'ok' and $tmpRootResult == 'ok' and $dataRootResult == 'ok' and $sessionResult == 'ok')
-    {
-        echo html::a($this->createLink('install', 'step2'), $lang->install->next);
-    }
-    else
-    {
-        echo html::a($this->createLink('install', 'step1'), $lang->install->reload);
-        if($pdoResult == 'fail' or $pdoMySQLResult == 'fail')
-        {
-            echo '<p class="f-12px a-left">' . '<strong>' . $lang->install->phpINI . '</strong><br />' . nl2br($this->install->getIniInfo()) . '</p>';
-        }
-    }
-    ?>
-    </td>
-  </tr>
-</table>
+      ?>      
+    </div>
+  </div>
+</div>
+
 <?php include '../../common/view/footer.lite.html.php';?>
@@ -10,49 +10,56 @@
 */
 ?>
 <?php include '../../common/view/header.lite.html.php';?>
-<form method='post' action='<?php echo $this->createLink('install', 'step3');?>'>
-  <table align='center' class='table-6'>
-    <caption><?php echo $lang->install->setConfig;?></caption>
-    <tr>
-      <th class='w-p20'><?php echo $lang->install->key;?></th>
-      <th class='text-left'><?php echo $lang->install->value?></th>
-    </tr>
-    <tr>
-      <th><?php echo $lang->install->defaultLang;?></th>
-      <td><?php echo html::select('defaultLang', $config->langs, $app->getClientLang(), "class='form-control'");?></td>
-    </tr>
-    <tr>
-      <th><?php echo $lang->install->dbHost;?></th>
-      <td><?php echo html::input('dbHost', '127.0.0.1', "class='form-control'");?><?php echo $lang->install->dbHostNote;?></td>
-    </tr>
-    <tr>
-      <th><?php echo $lang->install->dbPort;?></th>
-      <td><?php echo html::input('dbPort', '3306', "class='form-control'");?></td>
-    </tr>
-    <tr>
-      <th><?php echo $lang->install->dbUser;?></th>
-      <td><?php echo html::input('dbUser', 'root', "class='form-control'");?></td>
-    </tr>
-    <tr>
-      <th><?php echo $lang->install->dbPassword;?></th>
-      <td><?php echo html::input('dbPassword', '', "class='form-control'");?></td>
-    </tr>
-    <tr>
-      <th><?php echo $lang->install->dbName;?></th>
-      <td><?php echo html::input('dbName', 'zentao', "class='form-control'");?></td>
-    </tr>
-    <tr>
-      <th><?php echo $lang->install->dbPrefix;?></th>
-      <td>
-      <?php 
-      echo html::input('dbPrefix', 'zt_', "class='form-control'");
-      echo html::checkBox('clearDB', $lang->install->clearDB);
-      ?>
-      </td>
-    </tr>
-    <tr>
-      <td colspan='2' class='text-center'><?php echo html::submitButton() . html::hidden('requestType', 'GET');?></td>
-    </tr>
-  </table>
-</form>
+<div class='container'>
+  <div class='modal-dialog'>
+    <form method='post' action='<?php echo $this->createLink('install', 'step3');?>' class='form-condensed'>
+      <div class='modal-header'><strong><?php echo $lang->install->setConfig;?></strong></div>
+      <div class='modal-body'>
+        <table align='center' class='table table-bordered table-form'>
+          <thead>
+            <tr class='text-center'>
+              <th class='w-p20'><?php echo $lang->install->key;?></th>
+              <th class='text-left' colspan='2'><?php echo $lang->install->value?></th>
+            </tr>
+          </thead>
+          <tr>
+            <th><?php echo $lang->install->defaultLang;?></th>
+            <td><?php echo html::select('defaultLang', $config->langs, $app->getClientLang(), "class='form-control'");?></td><td></td>
+          </tr>
+          <tr>
+            <th><?php echo $lang->install->dbHost;?></th>
+            <td><?php echo html::input('dbHost', '127.0.0.1', "class='form-control'");?></td>
+            <td><?php echo $lang->install->dbHostNote;?></td>
+          </tr>
+          <tr>
+            <th><?php echo $lang->install->dbPort;?></th>
+            <td><?php echo html::input('dbPort', '3306', "class='form-control'");?></td><td></td>
+          </tr>
+          <tr>
+            <th><?php echo $lang->install->dbUser;?></th>
+            <td><?php echo html::input('dbUser', 'root', "class='form-control'");?></td><td></td>
+          </tr>
+          <tr>
+            <th><?php echo $lang->install->dbPassword;?></th>
+            <td><?php echo html::input('dbPassword', '', "class='form-control'");?></td><td></td>
+          </tr>
+          <tr>
+            <th><?php echo $lang->install->dbName;?></th>
+            <td><?php echo html::input('dbName', 'zentao', "class='form-control'");?></td><td></td>
+          </tr>
+          <tr>
+            <th><?php echo $lang->install->dbPrefix;?></th>
+            <td>
+            <?php echo html::input('dbPrefix', 'zt_', "class='form-control'");?>
+            </td>
+            <td><?php echo html::checkBox('clearDB', $lang->install->clearDB);?></td>
+          </tr>
+        </table>
+      </div>
+      <div class='modal-footer'>
+        <?php echo html::submitButton() . html::hidden('requestType', 'GET');?>
+      </div>
+    </form>
+  </div>
+</div>
 <?php include '../../common/view/footer.lite.html.php';?>
@@ -30,43 +30,53 @@ if(!isset($error))
 EOT;
 }
 ?>
-<?php if(isset($error)):?>
-<table class='table-6' align='center'>
-<caption><?php echo $lang->install->error;?></caption>
-  <tr><td><?php echo $error;?></td></tr>
-  <tr><td><?php echo html::commonButton($lang->install->pre, "onclick='javascript:history.back(-1)'");?></td></tr>
-</table>
-<?php else:?>
-<table class='table-6' align='center'>
-  <caption><?php echo $lang->install->saveConfig;?></caption>
-  <tr>
-    <td class='text-center'><?php echo html::textArea('config', $configContent, "rows='15' class='area-1 f-12px'");?></td>
-  </tr>
-  <tr>
-    <td>
-    <?php
-    $configRoot   = $this->app->getConfigRoot();
-    $myConfigFile = $configRoot . 'my.php';
-    if(is_writable($configRoot))
-    {
-        if(@file_put_contents($myConfigFile, $configContent))
+<div class='container'>
+  <div class='modal-dialog'>
+  <?php if(isset($error)):?>
+    <div class='modal-header'>
+      <strong><?php echo $lang->install->error;?></strong>
+    </div>
+    <div class='modal-body'>
+      <div class='alert alert-danger'>
+        <i class='icon-info-sign'></i>
+        <div class='content'><?php echo $error;?></div>
+      </div>
+    </div>
+    <div class='modal-footer'>
+      <?php echo html::commonButton($lang->install->pre, "onclick='javascript:history.back(-1)'");?>
+    </div>
+  <?php else:?>
+    <div class='modal-header'>
+      <strong><?php echo $lang->install->saveConfig;?></strong>
+    </div>
+    <div class='modal-body'>
+      <div class='form-group'>
+        <?php echo html::textArea('config', $configContent, "rows='15' class='form-control'");?>
+      </div>
+      <div class='help-block text-center'>
+        <?php
+        $configRoot   = $this->app->getConfigRoot();
+        $myConfigFile = $configRoot . 'my.php';
+        if(is_writable($configRoot))
        {
-            printf($lang->install->saved2File, $myConfigFile);
+            if(@file_put_contents($myConfigFile, $configContent))
+            {
+                printf($lang->install->saved2File, $myConfigFile);
+            }
+            else
+            {
+                printf($lang->install->save2File, $this->app->getConfigRoot() . 'my.php');
+            }
        }
        else
        {
            printf($lang->install->save2File, $this->app->getConfigRoot() . 'my.php');
        }
-    }
-    else
-    {
-        printf($lang->install->save2File, $this->app->getConfigRoot() . 'my.php');
-    }
-    echo "<br />";
-    echo "<div class='text-center'>" . html::a($this->createLink('install', 'step4'), $lang->install->next) . '</div>';
-    ?>
-    </td>
-  </tr>
-</table>
-<?php endif;?>
+        ?>
+      </div>
+    </div>
+    <div class='modal-footer'><?php echo html::a($this->createLink('install', 'step4'), $lang->install->next, '', "class='btn btn-primary'");?></div>
+  <?php endif;?>
+  </div>
+</div>
 <?php include '../../common/view/footer.lite.html.php';?>
@@ -10,38 +10,63 @@
 */
 ?>
 <?php include '../../common/view/header.lite.html.php';?>
-<?php if(isset($error)):?>
-<table class='table-6' align='center'>
-<caption><?php echo $lang->install->error;?></caption>
-  <tr><td><?php echo $error;?></td></tr>
-  <tr><td><?php echo html::commonButton($lang->install->pre, "onclick='javascript:history.back(-1)'");?></td></tr>
-</table>
-<?php elseif(isset($success)):?>
-<table class='table-6' align='center'>
-  <caption><?php echo $lang->install->success;?></caption>
-  <tr><td><?php echo $lang->install->afterSuccess;?></td></tr>
-  <tr><td><?php echo html::commonButton($lang->install->pre, "onclick='javascript:history.back(-1)'");?></td></tr>
-</table>
-<?php else:?>
-<form class='form-condensed' method='post' target='hiddenwin'>
-<table class='table-6' align='center'>
-  <caption><?php echo $lang->install->getPriv;?></caption>
-  <tr>
-    <th><?php echo $lang->install->company;?></th>
-    <td><?php echo html::input('company');?></td>
-  </tr>
-  <tr>
-    <th><?php echo $lang->install->account;?></th>
-    <td><?php echo html::input('account');?></td>
-  </tr>
-  <tr>
-    <th><?php echo $lang->install->password;?></th>
-    <td><?php echo html::input('password') .  html::checkBox('importDemoData', $lang->install->importDemoData);?></td>
-  </tr>
-  <tr class='text-center'>
-    <td colspan='2'><?php echo html::submitButton();?></td>
-  </tr>
-</table>
-</form>
-<?php endif;?>
+<div class='container'>
+  <div class='modal-dialog'>
+  <?php if(isset($error)):?>
+    <div class='modal-header'>
+      <strong><?php echo $lang->install->error;?></strong>
+    </div>
+    <div class='modal-body'>
+      <div class='alert alert-danger'>
+        <i class='icon-info-sign'></i>
+        <div class='content'><?php echo $error;?></div>
+      </div>
+    </div>
+    <div class='modal-footer'>
+      <?php echo html::commonButton($lang->install->pre, "onclick='javascript:history.back(-1)'");?>
+    </div>
+  <?php elseif(isset($success)):?>
+    <div class='modal-header'>
+      <strong><?php echo $lang->install->success;?></strong>
+    </div>
+    <div class='modal-body'>
+      <div class='alert alert-success'>
+        <i class='icon-ok-sign'></i>
+        <div class='content'><?php echo $afterSuccess;?></div>
+      </div>
+    </div>
+    <div class='modal-footer'>
+      <?php echo html::commonButton($lang->install->pre, "onclick='javascript:history.back(-1)'");?>
+    </div>
+  <?php else:?>
+    <div class='modal-header'>
+      <strong><?php echo $lang->install->getPriv;?></strong>
+    </div>
+    <div class='modal-body'>
+      <form class='form-condensed' method='post' target='hiddenwin'>
+        <table class='table table-form mw-400px' style='margin: 0 auto'>
+          <tr>
+            <th class='w-100px'><?php echo $lang->install->company;?></th>
+            <td><?php echo html::input('company', '', "class='form-control'");?></td>
+          </tr>
+          <tr>
+            <th><?php echo $lang->install->account;?></th>
+            <td><?php echo html::input('account', '', "class='form-control'");?></td>
+          </tr>
+          <tr>
+            <th><?php echo $lang->install->password;?></th>
+            <td><?php echo html::input('password', '', "class='form-control'");?></td>
+          </tr>
+          <tr>
+            <th></th><td><?php echo html::checkBox('importDemoData', $lang->install->importDemoData);?></td>
+          </tr>
+          <tr class='text-center'>
+            <td colspan='2'><?php echo html::submitButton();?></td>
+          </tr>
+        </table>
+      </form>
+    </div>
+  <?php endif;?>
+  </div>
+</div>
 <?php include '../../common/view/footer.lite.html.php';?>
@@ -10,12 +10,24 @@
 */
 ?>
 <?php include '../../common/view/header.lite.html.php';?>
-<table align='center' class='table-6'>
-  <caption><?php echo $lang->install->success;?></caption>
-  <tr>
-	<td>
-	  <?php echo nl2br(sprintf($lang->install->joinZentao, $config->version, $this->createLink('admin', 'register'), $this->createLink('admin', 'bind'), inlink('step6')));?>
-	</td>
-  </tr>
-</table>
+<div class='container'>
+  <div class='modal-dialog'>
+    <div class='modal-header'>
+      <strong><?php echo $lang->install->success;?></strong>
+    </div>
+    <div class='modal-body'>
+      <div class='alert alert-success'>
+        <i class='icon-ok-sign'></i>
+        <div class='content'><?php echo nl2br(sprintf($lang->install->joinZentao, $config->version, $this->createLink('admin', 'register'), $this->createLink('admin', 'bind'), inlink('step6')));?></div>
+      </div>
+    </div>
+    <div class='modal-footer'>
+      <?php 
+      echo html::a('http://www.zentao.net', $lang->install->regist, '_blank', "class='btn btn-success'");
+      echo "<span class='text-muted'> &nbsp; " . $lang->install->or . ' &nbsp; </span>';
+      echo html::a('/index', $lang->install->login, '', "class='btn btn-primary'");
+      ?>
+    </div>
+  </div>
+</div>
 <?php include '../../common/view/footer.lite.html.php';?>
@@ -98,10 +98,12 @@
       <tr>
        <th><nobr><?php echo $lang->story->mailto;?></nobr></th>
        <td colspan='3'>
-          <?php 
-          echo html::select('mailto[]', $users, str_replace(' ' , '', $mailto), "multiple"); 
-          if($contactLists) echo html::select('', $contactLists, '', "class='text-right' onchange=\"setMailto('mailto', this.value)\"");
-          ?>
+          <div class='input-group'>
+            <?php 
+            echo html::select('mailto[]', $users, str_replace(' ' , '', $mailto), "multiple"); 
+            if($contactLists) echo html::select('', $contactLists, '', "class='form-control' style='width: 150px' onchange=\"setMailto('mailto', this.value)\"");
+            ?>
+          </div>
        </td>
      </tr>

@@ -114,7 +114,7 @@ function setStories(moduleID, projectID)
        $('#story').replaceWith(stories);
        $('#story').val(storyID);
        setPreview();
-        $('#story_chzn').remove();
+        $('#story_chosen').remove();
        $("#story").chosen({no_results_text: ''});
    });
 }
@@ -1 +1,12 @@
-body{background:white; margin-top:50px}
+body{background: #f1f1f1;}
+.container{padding: 0}
+.modal-dialog{width: 800px}
+.modal-footer{text-align: center;margin-top: 0;}
+
+.table,.alert{margin: 0;}
+.table+.alert{margin-top: 20px;}
+.table.table-form>thead>tr>th, .table.table-form>tbody>tr>th, .table.table-form>tfoot>tr>th{color: #666}
+.table>thead>tr>th{background-color: transparent;}
+.table.table-form>thead>tr>th, .table.table-form>tbody>tr>th, .table.table-form>tfoot>tr>th, .table.table-form>thead>tr>td, .table.table-form>tbody>tr>td, .table.table-form>tfoot>tr>td{vertical-align: middle;}
+
+@media (max-width: 700px){.modal-dialog{padding: 0;} .modal-content{box-shadow: none;border-width: 1px 0;border-radius: 0}}
@@ -20,7 +20,7 @@ $lang->upgrade->warnningContent = <<<EOT
 备份方法：<br />
 1. 可以通过phpMyAdmin进行备份。<br />
 2. 使用mysql命令行的工具。<br />
-   # mysqldump -u <span class='red'>username</span> -p <span class='red'>dbname</span> > <span class='red'>filename</span> <br />
+   # mysqldump -u <span class='text-danger'>username</span> -p <span class='text-danger'>dbname</span> > <span class='text-danger'>filename</span> <br />
   要将上面红色的部分分别替换成对应的用户名和禅道系统的数据库名。<br />
   比如： mysqldump -u root -p zentao >zentao.bak
 EOT;
@@ -10,17 +10,17 @@
 */
 ?>
 <?php include '../../common/view/header.lite.html.php';?>
-<style>body{background:white}</style>
-<div class='yui-d0' style='margin-top:50px'>
+<div class='container'>
  <form method='post' action='<?php echo inlink('execute');?>'>
-  <table align='center' class='table-6 f-14px'>
-    <caption><?php echo $lang->upgrade->confirm;?></caption>
-    <tr>
-      <td class='text-center'><textarea rows='20' class='form-control'><?php echo $confirm;?></textarea></td>
-    <tr>
-      <td class='text-center'><?php echo html::submitButton($lang->upgrade->sureExecute) . html::hidden('fromVersion', $fromVersion);?></td>
-    </tr>
-  </table>
+    <div class='modal-dialog'>
+      <div class='modal-header'>
+        <strong><?php echo $lang->upgrade->confirm;?></strong>
+      </div>
+      <div class='modal-body'>
+        <textarea rows='20' class='form-control'><?php echo $confirm;?></textarea>
+      </div>
+      <div class='modal-footer'><?php echo html::submitButton($lang->upgrade->sureExecute) . html::hidden('fromVersion', $fromVersion);?></div>
+    </div>
  </form>
 </div>
 <?php include '../../common/view/footer.lite.html.php';?>
@@ -10,26 +10,21 @@
 */
 ?>
 <?php include '../../common/view/header.lite.html.php';?>
-<table align='center' class='table-5 f-14px'>
-  <caption><?php echo $lang->upgrade->$result;?></caption>
-  <tr>
-    <td>
-    <?php
-    if($result == 'fail')
-    {
-        echo nl2br(join('\n', $errors));
-    }
-    else
-    {
-        echo "<p id='tohome'></p>";
-    }
-    ?>
-    </td>
-  </tr>
-  <tr>
-    <td id='checkExtension'><?php if($result == 'success') echo $lang->upgrade->checkExtension?></td>
-  </tr>
-</table>
+<div class='container'>
+  <div class='modal-dialog'>
+    <div class='modal-header'>
+      <strong><?php echo $lang->upgrade->result;?></strong>
+    </div>
+    <div class='modal-body'>
+      <?php if($result == 'fail'):?>
+      <pre><?php echo nl2br(join('\n', $errors));?></pre>
+      <?php else:?>
+      <div id='tohome'></div>
+      <?php endif;?>
+      <div id='checkExtension'><?php if($result == 'success') echo $lang->upgrade->checkExtension?></div>
+    </div>
+  </div>
+</div>
 <script>
 var tohome = <?php echo json_encode(html::linkButton($lang->upgrade->tohome, 'index.php'))?>;
 var result = '<?php echo $result?>';
@@ -10,13 +10,18 @@
 */
 ?>
 <?php include '../../common/view/header.lite.html.php';?>
-<table align='center' class='table-5 f-14px'>
-  <caption><?php echo $lang->upgrade->warnning;?></caption>
-  <tr>
-    <td><?php echo $lang->upgrade->warnningContent;?></td>
-  </tr>
-  <tr>
-    <td colspan='2' class='text-center'><?php echo html::linkButton($lang->upgrade->common, inlink('selectVersion'));?></td>
-  </tr>
-</table>
+<div class='container'>
+  <div class='modal-dialog'>
+    <div class='modal-header'>
+      <strong><?php echo $lang->upgrade->warnning;?></strong>
+    </div>
+    <div class='modal-body'>
+      <div class='alert alert-warning'>
+        <i class='icon-info-sign'></i>
+        <div class='content'><?php echo $lang->upgrade->warnningContent;?></div>
+      </div>
+    </div>
+    <div class='modal-footer'><?php echo html::linkButton($lang->upgrade->common, inlink('selectVersion'));?></div>
+  </div>
+</div>
 <?php include '../../common/view/footer.lite.html.php';?>
@@ -10,20 +10,29 @@
 */
 ?>
 <?php include '../../common/view/header.lite.html.php';?>
-<form method='post' action='<?php echo inlink('confirm');?>'>
-  <table align='center' class='table-5 f-14px'>
-    <caption><?php echo $lang->upgrade->selectVersion;?></caption>
-    <tr>
-      <th class='w-p20 rowhead'><?php echo $lang->upgrade->fromVersion;?></th>
-      <td><?php echo html::select('fromVersion', $lang->upgrade->fromVersions, $version) . "<span class='red'>{$lang->upgrade->noteVersion}</span>";?></td>
-    </tr>
-    <tr>
-      <th class='w-p20 rowhead'><?php echo $lang->upgrade->toVersion;?></th>
-      <td><?php echo $config->version;?></td>
-    </tr>
-    <tr>
-      <td colspan='2' class='text-center'><?php echo html::submitButton($lang->upgrade->common);?></td>
-    </tr>
-  </table>
-</form>
+<div class='container'>
+  <form class='form-condensed' method='post' action='<?php echo inlink('confirm');?>'>
+    <div class='modal-dialog'>
+      <div class='modal-header'>
+        <strong><?php echo $lang->upgrade->selectVersion;?></strong>
+      </div>
+      <div class='modal-body'>
+        <table class='table table-form'>
+          <tr>
+            <th class='w-100px'><?php echo $lang->upgrade->fromVersion;?></th>
+            <td><?php echo html::select('fromVersion', $lang->upgrade->fromVersions, $version, "class='form-control'");?></td>
+            <td class='text-danger'><?php echo $lang->upgrade->noteVersion;?></td>
+          </tr>
+          <tr>
+            <th><?php echo $lang->upgrade->toVersion;?></th>
+            <td><?php echo $config->version;?></td>
+          </tr>
+        </table>
+      </div>
+      <div class='modal-footer'>
+        <?php echo html::submitButton($lang->upgrade->common);?>
+      </div>
+    </div>
+  </form>
+</div>
 <?php include '../../common/view/footer.lite.html.php';?>
@@ -516,8 +516,8 @@ function setMailto(mailto, contactListID)
    $.get(link, function(users)
    {
        $('#' + mailto).replaceWith(users);
-        $('#' + mailto + '_chzn').remove();
-        $('#' + mailto).chosen({no_results_text: noResultsMatch});
+        $('#' + mailto + '_chosen').remove();
+        $('#' + mailto).chosen(defaultChosenOptions);
    });
 }

@@ -170,6 +170,9 @@ i[class^="icon-"].disabled,i[class*=" icon-"].disabled,i[class^="icon-"].disable
 .form-condensed fieldset.collapsed legend:before {content: '\e6bb'}
 .form-condensed .chosen-container-single .chosen-single {padding: 4px 10px; height: 30px}
 .form-condensed .chosen-container-single .chosen-single div {padding: 4px 10px}
+.form-condensed .chosen-container-multi .chosen-choices {min-height: 30px}
+.form-condensed .chosen-container-multi .chosen-choices li {margin: 4px 0 0 4px}
+.form-condensed .chosen-container-multi .chosen-choices li.search-field {margin-bottom: 4px;}
 .form-condensed .table-fixed .form-control {padding: 5px 6px}
 .form-condensed .table-fixed select.form-control {padding: 5px}
 .form-condensed .chosen-container {font-size: 12px}