* fixed style.

2014-04-26 19:41:54 +08:00
parent a3985d73d7
commit d2decf65fc
13 changed files with 45 additions and 57 deletions
--- a/module/bug/view/activate.html.php
+++ b/module/bug/view/activate.html.php
@@ -24,8 +24,8 @@
 <form class='form-condensed' method='post' enctype='multipart/form-data' target='hiddenwin'>
  <table class='table table-form'>
    <tr>
-      <th class='w-80px'><?php echo $lang->bug->assignedTo;?></th>
-      <td><?php echo html::select('assignedTo', $users, $bug->resolvedBy, "class='form-control'");?></td>
+      <th class='w-70px'><?php echo $lang->bug->assignedTo;?></th>
+      <td class='w-p25-f'><?php echo html::select('assignedTo', $users, $bug->resolvedBy, "class='form-control'");?></td><td></td>
    </tr>
    <tr>
      <th><?php echo $lang->bug->openedBuild;?></th>
@@ -33,14 +33,14 @@
    </tr>
    <tr>
      <th><?php echo $lang->comment;?></th>
-      <td><?php echo html::textarea('comment', '', "rows='6' class='form-control'");?></td>
+      <td colspan='2'><?php echo html::textarea('comment', '', "rows='6' class='form-control'");?></td>
    </tr>
    <tr>
      <th><?php echo $lang->bug->files;?></th>
-      <td class='text-left'><?php echo $this->fetch('file', 'buildform');?></td>
+      <td colspan='2' class='text-left'><?php echo $this->fetch('file', 'buildform');?></td>
    </tr>  
    <tr>
-      <td colspan='2' class='text-center'><?php echo html::submitButton() . html::linkButton($lang->goback, $this->session->bugList);?></td>
+      <td colspan='3' class='text-center'><?php echo html::submitButton() . html::linkButton($lang->goback, $this->session->bugList);?></td>
    </tr>
  </table>
 </form>
--- a/module/bug/view/view.html.php
+++ b/module/bug/view/view.html.php
@@ -161,6 +161,10 @@
                <th><?php echo $lang->bug->keywords;?></th>
                <td><?php echo $bug->keywords;?></td>
              </tr>
+              <tr>
+                <th><?php echo $lang->bug->mailto;?></th>
+                <td><?php $mailto = explode(',', str_replace(' ', '', $bug->mailto)); foreach($mailto as $account) echo ' ' . $users[$account]; ?></td>
+              </tr>
            </table>
          </div>
          <div class='tab-pane' id='legendPrjStoryTask'>
@@ -194,7 +198,6 @@
      <div class='tabs'>
        <ul class='nav nav-tabs'>
          <li class='active'><a href='#legendLife' data-toggle='tab'><?php echo $lang->bug->legendLife;?></a></li>
-          <li><a href='#case' data-toggle='tab'><?php echo $lang->bug->case;?></a></li>
          <li><a href='#legendMisc' data-toggle='tab'><?php echo $lang->bug->legendMisc;?></a></li>
        </ul>
        <div class='tab-content'>
@@ -247,14 +250,14 @@
              </tr>
            </table>
          </div>
-          <div class='tab-pane active' id='case'>
-            <table class='table table-data table-condensed table-borderless'>
+          <div class='tab-pane' id='legendMisc'>
+            <table class='table table-data table-condensed table-borderless table-fixed'>
              <tr>
                <th class='w-60px'><?php echo $lang->bug->fromCase;?></th>
                <td><?php if($bug->case) echo html::a($this->createLink('testcase', 'view', "caseID=$bug->case"), $bug->caseTitle);?></td>
              </tr>
              <tr>
-                <th valign="top" class='rowhead w-p20'><?php echo $lang->bug->toCase;?></th>
+                <th><?php echo $lang->bug->toCase;?></th>
                <td>
                <?php 
                foreach($bug->toCases as $caseID => $case) 
@@ -264,14 +267,6 @@
                ?>
                </td>
              </tr>
-            </table>
-          </div>
-          <div class='tab-pane active' id='legendMisc'>
-            <table class='table table-data table-condensed table-borderless table-fixed'>
-              <tr>
-                <th class='w-60px'><?php echo $lang->bug->mailto;?></th>
-                <td><?php $mailto = explode(',', str_replace(' ', '', $bug->mailto)); foreach($mailto as $account) echo ' ' . $users[$account]; ?></td>
-              </tr>
              <tr>
                <th><?php echo $lang->bug->linkBug;?></th>
                <td>
--- a/module/convert/css/common.css
+++ b/module/convert/css/common.css
@@ -0,0 +1 @@
+.outer > .container > form {padding: 20px}
--- a/module/convert/css/selectsource.css
+++ b/module/convert/css/selectsource.css
@@ -0,0 +1,2 @@
+.outer > .container > form {padding: 20px}
+.outer > .container > form .table-form {border: 1px solid #ddd}
--- a/module/convert/view/checkconfig.html.php
+++ b/module/convert/view/checkconfig.html.php
@@ -14,8 +14,7 @@
  <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><?php echo $lang->convert->checkConfig;?></strong>
      <strong class='text-important'> <?php echo strtoupper($source);?></strong>
    </div>
  </div>
--- a/module/convert/view/selectsource.html.php
+++ b/module/convert/view/selectsource.html.php
@@ -14,12 +14,11 @@
  <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->selectSource . ' ' . html::icon('bullseye');?></small>
+      <strong><?php echo $lang->convert->selectSource;?></strong>
    </div>
  </div>
  <form method='post' action='<?php echo inlink('setConfig');?>'>
-    <table class='table table-form'>
+    <table class='table table-form mgb-20'>
      <thead>
        <tr>
          <th class='w-100px text-right'><?php echo $lang->convert->source;?></th>
@@ -32,10 +31,10 @@
        <td><?php echo html::radio('source', $versions);?></td>
      </tr>
      <?php endforeach;?>
-      <tr>
-        <td colspan='2' class='text-center'><?php echo html::submitButton();?></td>
-      </tr>
    </table>
+    <div class='text-center'>
+      <?php echo html::submitButton();?>
+    </div>
  </form>
 </div>

--- a/module/convert/view/setconfig.html.php
+++ b/module/convert/view/setconfig.html.php
@@ -14,8 +14,7 @@
  <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->setting . $lang->colon . strtoupper($source) . ' ' . html::icon('cog');?></small>
+      <strong><?php echo $lang->convert->setting;?> <?php echo strtoupper($source) . ' ' . html::icon('cog');?></strong>
    </div>
  </div>
  <form class='form-condensed' method='post' action='<?php echo inlink('checkconfig');?>'>
--- a/module/extension/view/obtain.html.php
+++ b/module/extension/view/obtain.html.php
@@ -17,21 +17,18 @@
    <div class='col-md-4 col-lg-3'>
      <form class='side-search mgb-20' method='post' action='<?php echo inlink('obtain', 'type=bySearch');?>'>
        <div class="input-group">
-          <?php echo html::input('key', $this->post->key, "class='form-control'");?>
+          <?php echo html::input('key', $this->post->key, "class='form-control' placeholder='{$lang->extension->bySearch}'");?>
          <span class="input-group-btn">
-            <?php echo html::submitButton('<i class="icon-search"></i> ' . $lang->extension->bySearch, '', ''); ?>
+            <?php echo html::submitButton('<i class="icon-search"></i>', '', ''); ?>
          </span>
        </div>
      </form>
-      <div class='panel panel-sm'>
-        <div class='panel-heading'><?php echo $lang->extension->obtain;?></div>
-        <div class='list-group'>
-            <?php
-            echo html::a(inlink('obtain', 'type=byUpdatedTime'), $lang->extension->byUpdatedTime, '', "class='list-group-item' id='byupdatedtime'");
-            echo html::a(inlink('obtain', 'type=byAddedTime'),   $lang->extension->byAddedTime, '', "class='list-group-item' id='byaddedtime'");
-            echo html::a(inlink('obtain', 'type=byDownloads'),   $lang->extension->byDownloads, '', "class='list-group-item' id='bydownloads'");
-            ?>
-        </div>
+      <div class='list-group'>
+          <?php
+          echo html::a(inlink('obtain', 'type=byUpdatedTime'), $lang->extension->byUpdatedTime, '', "class='list-group-item' id='byupdatedtime'");
+          echo html::a(inlink('obtain', 'type=byAddedTime'),   $lang->extension->byAddedTime, '', "class='list-group-item' id='byaddedtime'");
+          echo html::a(inlink('obtain', 'type=byDownloads'),   $lang->extension->byDownloads, '', "class='list-group-item' id='bydownloads'");
+          ?>
      </div>
      <div class='panel panel-sm'>
        <div class='panel-heading'><?php echo $lang->extension->byCategory;?></div>
--- a/module/file/view/export.html.php
+++ b/module/file/view/export.html.php
@@ -48,7 +48,7 @@ function switchEncode(fileType)
    <strong><?php echo $lang->export;?></strong>
  </div>
 </div>
-<form class='form-condensed' method='post' target='hiddenwin' onsubmit='setDownloading();' style='padding: 40px 5%'>
+<form class='form-condensed' method='post' target='hiddenwin' onsubmit='setDownloading();' style='padding: 80px 15%'>
  <table class='w-p100'>
    <tr>
      <td>
@@ -57,10 +57,10 @@ function switchEncode(fileType)
          <?php echo html::input('fileName', '', 'class=form-control');?>
        </div>
      </td>
-      <td class='w-60px'>
+      <td class='w-80px'>
        <?php echo html::select('fileType',   $lang->exportFileTypeList, '', 'onchange=switchEncode(this.value) class="form-control"');?>
      </td>
-      <td class='w-80px'>
+      <td class='w-90px'>
        <?php echo html::select('encode',     $config->charsets[$this->cookie->lang], 'utf-8', key($lang->exportFileTypeList) == 'csv' ? "class='form-control'" : "class='hidden'");?>
      </td>
      <td class='w-100px'>
--- a/module/project/view/linkstory.html.php
+++ b/module/project/view/linkstory.html.php
@@ -13,7 +13,7 @@
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/tablesorter.html.php';?>
 <div id='titlebar'>
-  <div class='heading'>
+  <div class='heading' style='margin-bottom: 15px'>
    <span class='prefix'><?php echo html::icon($lang->icons['story']);?></span>
    <strong><small><?php echo html::icon($lang->icons['link']);?></small> <?php echo $lang->project->linkStory;?></strong>
  </div>
--- a/module/story/view/batchcreate.html.php
+++ b/module/story/view/batchcreate.html.php
@@ -15,7 +15,6 @@
  <div class='heading'>
    <span class='prefix'><?php echo html::icon($lang->icons['story']);?></span>
    <strong><small class='text-muted'><?php echo html::icon($lang->icons['batchCreate']);?></small> <?php echo $lang->story->batchCreate;?></strong>
-    <small class='text-muted'><?php echo html::icon($lang->icons['product']) . ' ' . $lang->story->product . $lang->colon . ' ' . $productName;?></small>
  </div>
 </div>
 <form class='form-condensed' method='post' enctype='multipart/form-data' target='hiddenwin'>
--- a/module/todo/view/create.html.php
+++ b/module/todo/view/create.html.php
@@ -13,7 +13,7 @@
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/datepicker.html.php';?>
 <?php include '../../common/view/kindeditor.html.php';?>
-<div class='container mw-700px'>
+<div class='container'>
  <div id='titlebar'>
    <div class='heading'>
      <span class='prefix'><?php echo html::icon($lang->icons['todo']);?></span>
@@ -57,10 +57,10 @@
        <th><?php echo $lang->todo->beginAndEnd;?></th>
        <td>
          <div class='input-group'>
-            <?php echo html::select('begin', $times, $time, 'onchange=selectNext(); class="form-control" style="width: 50%"') . html::select('end', $times, '', 'class="form-control" style="width: 50%"');?>
+            <?php echo html::select('begin', $times, $time, 'onchange=selectNext(); class="form-control" style="width: 50%;"') . html::select('end', $times, '', 'class="form-control" style="width: 50%; margin-left:-1px"');?>
          </div>
        </td>
-        <td><input type='checkbox' id='switchDate' onclick='switchDateFeature(this);'><?php echo $lang->todo->lblDisableDate;?></td>
+        <td><input type='checkbox' id='switchDate' onclick='switchDateFeature(this);'> <?php echo $lang->todo->lblDisableDate;?></td>
      </tr>  
      <tr>
        <th><?php echo $lang->todo->private;?></th>
--- a/module/webapp/view/obtain.html.php
+++ b/module/webapp/view/obtain.html.php
@@ -17,21 +17,18 @@
    <div class='col-md-3'>
      <form class='side-search mgb-20' method='post' action='<?php echo inlink('obtain', 'type=bySearch');?>'>
        <div class="input-group">
-          <?php echo html::input('key', $this->post->key, "class='form-control'");?>
+          <?php echo html::input('key', $this->post->key, "class='form-control' placeholder='{$lang->webapp->bySearch}'");?>
          <span class="input-group-btn">
-            <?php echo html::submitButton('<i class="icon-search"></i> ' . $lang->webapp->bySearch, '', ''); ?>
+            <?php echo html::submitButton('<i class="icon-search"></i>', '', ''); ?>
          </span>
        </div>
      </form>
-      <div class='panel panel-sm'>
-        <div class='panel-heading'><?php echo $lang->webapp->obtain;?></div>
-        <div class='list-group'>
-            <?php
-            echo html::a(inlink('obtain', 'type=byUpdatedTime'), $lang->webapp->byUpdatedTime, '', "class='list-group-item' id='byupdatedtime'");
-            echo html::a(inlink('obtain', 'type=byAddedTime'),   $lang->webapp->byAddedTime, '', "class='list-group-item' id='byaddedtime'");
-            echo html::a(inlink('obtain', 'type=byDownloads'),   $lang->webapp->byDownloads, '', "class='list-group-item' id='bydownloads'");
-            ?>
-        </div>
+      <div class='list-group'>
+          <?php
+          echo html::a(inlink('obtain', 'type=byUpdatedTime'), $lang->webapp->byUpdatedTime, '', "class='list-group-item' id='byupdatedtime'");
+          echo html::a(inlink('obtain', 'type=byAddedTime'),   $lang->webapp->byAddedTime, '', "class='list-group-item' id='byaddedtime'");
+          echo html::a(inlink('obtain', 'type=byDownloads'),   $lang->webapp->byDownloads, '', "class='list-group-item' id='bydownloads'");
+          ?>
      </div>
      <div class='panel panel-sm'>
        <div class='panel-heading'><?php echo $lang->webapp->byCategory;?></div>