diff --git a/module/bug/css/create.css b/module/bug/css/create.css index a1e7e704e7..b7597cc6b5 100644 --- a/module/bug/css/create.css +++ b/module/bug/css/create.css @@ -16,6 +16,15 @@ #module_chosen.chosen-container .chosen-drop {min-width: 400px; border-top: 1px solid #ddd!important} #openedBuild_chosen.chosen-container .chosen-drop {min-width: 450px; border-top: 1px solid #ddd!important} +#module + .chosen-container-single .chosen-single, +#openedBuild + .chosen-container-multi .chosen-choices {border-top-left-radius: 0; border-bottom-left-radius: 0; margin-left: -1px;} +#openedBuild + .chosen-container-multi .chosen-choices, +#mailto + .chosen-container-multi .chosen-choices {border-top-right-radius: 0; border-bottom-right-radius: 0; margin-left: -1px;} -.row .col-sm-8{width:75%;} -.row .col-sm-4{padding-left:0px; width:25%;} +.dropdown-pris > .btn {background-color: #fff; text-shadow: none} + +/* Keep label has same width as relative task label*/ +#keywordsAddonLabel:before {content: '空'; color: transparent} + +#contactListGroup .input-group-btn > .btn {margin-left: -1px!important;} +#contactListGroup .input-group-btn > .btn:first-child {border-left: none} diff --git a/module/bug/js/create.js b/module/bug/js/create.js index b07044dece..98372a66e0 100644 --- a/module/bug/js/create.js +++ b/module/bug/js/create.js @@ -55,47 +55,6 @@ function setAssignedTo(moduleID, productID) }); } -$(function() -{ - if($('#project').val()) loadProjectRelated($('#project').val()); - $('#saveTplBtn').on('click', function() - { - var content = $('#steps').val(); - bootbox.prompt(setTemplateTitle, function(r) - { - if(!r || !content) return; - saveTemplateLink = createLink('bug', 'saveTemplate'); - $.post(saveTemplateLink, {title:r, content:content}, function(data) - { - $('#tplBox').html(data); - }); - }); - }); -}); - -// /* Save template. */ -// KindEditor.plugin('savetemplate', function(K) -// { -// var self = this, name = 'savetemplate'; -// self.plugin.savetemplate = -// { -// click: function(id) -// { -// content = self.html(); -// bootbox.prompt(setTemplateTitle, function(r) -// { -// if(!r || !content) return; -// saveTemplateLink = createLink('bug', 'saveTemplate'); -// $.post(saveTemplateLink, {title:r, content:content}, function(data) -// { -// $('#tplBox').html(data); -// }); -// }); -// } -// }; -// self.clickToolbar(name, self.plugin.savetemplate.click); -// }); - /* Set template. */ function setTemplate(templateID) { @@ -112,3 +71,31 @@ function deleteTemplate(templateID) hiddenwin.location.href = createLink('bug', 'deleteTemplate', 'templateID=' + templateID); $('#tplBox' + templateID).addClass('hidden'); } + +$(function() +{ + if($('#project').val()) loadProjectRelated($('#project').val()); + $('#saveTplBtn').on('click', function() + { + var content = $('#steps').val(); + bootbox.prompt(setTemplateTitle, function(r) + { + if(!r || !content) return; + saveTemplateLink = createLink('bug', 'saveTemplate'); + $.post(saveTemplateLink, {title:r, content:content}, function(data) + { + $('#tplBox').html(data); + }); + }); + }); + + $('[data-toggle=tooltip]').tooltip(); + + // ajust style for file box + var ajustFilebox = function() + { + applyCssStyle('.fileBox > tbody > tr > td:first-child {transition: none; width: ' + ($('#contactListGroup').width() - 2) + 'px}', 'filebox') + }; + ajustFilebox(); + $(window).resize(ajustFilebox); +}); diff --git a/module/bug/view/create.html.php b/module/bug/view/create.html.php index 783d635992..790853dcfc 100644 --- a/module/bug/view/create.html.php +++ b/module/bug/view/create.html.php @@ -63,7 +63,7 @@ js::set('refresh', $lang->refresh); bug->openedBuild?> - bug->allBuilds, "class='btn btn-default' onclick='loadAllBuilds()'")?> + ', "class='btn btn-default' data-toggle='tooltip' onclick='loadAllBuilds()' title='{$lang->bug->allBuilds}' style='border-left: none'")?> @@ -72,7 +72,7 @@ js::set('refresh', $lang->refresh);
- bug->allUsers, "class='btn btn-default' onclick='loadAllUsers()'");?> + ', "class='btn btn-default' onclick='loadAllUsers()' data-toggle='tooltip' title='{$lang->bug->allUsers}'");?>
@@ -97,14 +97,26 @@ js::set('refresh', $lang->refresh); bug->title;?> -
-
-
+
+
+
- bug->severity?> - bug->severityList, $severity, "class='form-control'");?> - bug->pri?> - bug->priList, $severity, "class='form-control'");?> + bug->severity;?> +
+ +
    + bug->severityList, $severity, "class='hide'");?> +
    + bug->pri;?> +
    + +
      + bug->priList, $pri, "class='hide'");?> +
      @@ -142,17 +154,15 @@ js::set('refresh', $lang->refresh); bug->lblMailto;?> -
      +
      '; - echo '' . $lang->user->contacts->manage . ''; - echo ''; - echo ''; - echo '' . $lang->refresh . ''; + echo ''; + echo ''; + echo ''; echo ''; } ?> @@ -160,7 +170,7 @@ js::set('refresh', $lang->refresh);
      - bug->keywords;?> + bug->keywords;?>
      diff --git a/module/story/js/create.js b/module/story/js/create.js index 9ed93eb63f..ea3a5cc9ec 100644 --- a/module/story/js/create.js +++ b/module/story/js/create.js @@ -24,6 +24,14 @@ $(function() }); $('[data-toggle=tooltip]').tooltip(); + + // ajust style for file box + var ajustFilebox = function() + { + applyCssStyle('.fileBox > tbody > tr > td:first-child {transition: none; width: ' + ($('#mailtoGroup').width() - 2) + 'px}', 'filebox') + }; + ajustFilebox(); + $(window).resize(ajustFilebox); }); diff --git a/module/story/view/create.html.php b/module/story/view/create.html.php index 186d7ddb26..55e87637d8 100644 --- a/module/story/view/create.html.php +++ b/module/story/view/create.html.php @@ -115,15 +115,15 @@ story->mailto;?> -
      +
      '; - echo ''; echo ''; + echo ''; echo ''; } ?> diff --git a/module/task/css/create.css b/module/task/css/create.css index 99084af0ae..f9fc89351b 100644 --- a/module/task/css/create.css +++ b/module/task/css/create.css @@ -1,5 +1,2 @@ -.input-group-btn {width: 0.01%} -.input-group-btn #copyButton{float:right;z-index:100;margin-top:-30px;} - -.row .col-sm-8{width:76%} -.row .col-sm-2{padding-left:0px; width:12%} +.dropdown-pris > .btn {background-color: #fff;} +#mailto + .chosen-container-multi .chosen-choices {border-top-left-radius: 0; border-bottom-left-radius: 0} diff --git a/module/task/js/create.js b/module/task/js/create.js index 025117abf9..11c1445832 100644 --- a/module/task/js/create.js +++ b/module/task/js/create.js @@ -55,8 +55,7 @@ function setPreview() if(!$('#story').val()) { $('#preview').addClass('hidden'); - $('#copyButton').addClass('hidden'); - $('input#name').css('padding-right', $('input#name').css('padding-left')); + $('#copyButton').parent().addClass('hidden'); } else { @@ -65,8 +64,7 @@ function setPreview() storyLink = storyLink + concat + 'onlybody=yes'; $('#preview').removeClass('hidden'); $('#preview a').attr('href', storyLink); - $('#copyButton').removeClass('hidden'); - $('input#name').css('padding-right', '60px'); + $('#copyButton').parent().removeClass('hidden'); } setAfter(); @@ -138,4 +136,14 @@ $(document).ready(function() $assignedTo.trigger('chosen:updated'); } }); + + $('[data-toggle=tooltip]').tooltip(); + + // ajust style for file box + var ajustFilebox = function() + { + applyCssStyle('.fileBox > tbody > tr > td:first-child {transition: none; width: ' + ($('#dataPlanGroup').width() - 2) + 'px}', 'filebox') + }; + ajustFilebox(); + $(window).resize(ajustFilebox); }); diff --git a/module/task/lang/en.php b/module/task/lang/en.php index 67548f6c7b..a3833060b8 100644 --- a/module/task/lang/en.php +++ b/module/task/lang/en.php @@ -53,6 +53,7 @@ $lang->task->consumedAB = 'Use'; $lang->task->hour = 'Hour'; $lang->task->consumedThisTime = 'Hours'; $lang->task->leftThisTime = 'Left'; +$lang->task->datePlan = 'Date plan'; $lang->task->estStarted = 'Estimate start'; $lang->task->realStarted = 'Real start'; $lang->task->date = 'Date'; diff --git a/module/task/lang/zh-cn.php b/module/task/lang/zh-cn.php index fd64784846..e52ee21a24 100644 --- a/module/task/lang/zh-cn.php +++ b/module/task/lang/zh-cn.php @@ -53,6 +53,7 @@ $lang->task->consumedAB = '消耗'; $lang->task->hour = '小时'; $lang->task->consumedThisTime = '工时'; $lang->task->leftThisTime = '剩余'; +$lang->task->datePlan = '日程规划'; $lang->task->estStarted = '预计开始'; $lang->task->realStarted = '实际开始'; $lang->task->date = '日期'; diff --git a/module/task/view/create.html.php b/module/task/view/create.html.php index 1e460d6c99..18861b184f 100644 --- a/module/task/view/create.html.php +++ b/module/task/view/create.html.php @@ -51,21 +51,25 @@ task->name;?> -
      -
      - name, "class='form-control'");?> - task->copyStoryTitle;?> -
      -
      -
      - task->pri;?> - task->priList, $task->pri, 'class=form-control');?> +
      +
      +
      + name, "class='form-control'");?> + task->copyStoryTitle;?>
      -
      +
      - task->estimate;?> - estimate, "class='form-control' autocomplete='off' placeholder='{$lang->task->hour}'")?> + task->pri;?> +
      + +
        + task->priList, $pri, "class='hide'");?> +
        + task->estimateAB;?> + task->hour}'");?>
        @@ -76,19 +80,17 @@ desc, "rows='10' class='form-control'");?> - task->estStarted;?> - estStarted, "class='form-control form-date'");?> + task->datePlan;?> -
        - task->deadline;?> - deadline, "class='form-control form-date'");?> +
        + estStarted, "class='form-control form-date' placeholder='{$lang->task->estStarted}'");?> + ~ + deadline, "class='form-control form-date' placeholder='{$lang->task->deadline}'");?>
        - - - task->mailto;?> - +
        + task->mailto;?> acl == 'private' ? $members : $users, str_replace(' ', '', $task->mailto), "multiple class='form-control'");?>
        diff --git a/module/testcase/css/create.css b/module/testcase/css/create.css index 3a5fca4722..ca2285ab8b 100644 --- a/module/testcase/css/create.css +++ b/module/testcase/css/create.css @@ -18,3 +18,12 @@ .row .col-sm-10{width:89%;} .row .col-sm-2{padding-left:0px; width:11%;} + +#module + .chosen-container-single .chosen-single, +#stage + .chosen-container-multi .chosen-choices {border-top-left-radius: 0; border-bottom-left-radius: 0; margin-left: -1px;} +#module + .chosen-container-single .chosen-single {border-top-right-radius: 0; border-bottom-right-radius: 0; margin-left: -1px;} + +.dropdown-pris > .btn {background-color: #fff; text-shadow: none} + +#moduleIdBox .input-group-btn > .btn {margin-left: -1px!important;} +#moduleIdBox .input-group-btn > .btn:first-child {border-left: none} diff --git a/module/testcase/js/create.js b/module/testcase/js/create.js index a92a6ed873..a63149ec36 100644 --- a/module/testcase/js/create.js +++ b/module/testcase/js/create.js @@ -151,4 +151,6 @@ $(function() }); $("#preview").modalTrigger({width:960, type:'iframe'}); + + $('[data-toggle=tooltip]').tooltip(); }) diff --git a/module/testcase/view/create.html.php b/module/testcase/view/create.html.php index f28e66246b..6acb2633f7 100644 --- a/module/testcase/view/create.html.php +++ b/module/testcase/view/create.html.php @@ -39,10 +39,9 @@ echo html::select('module', $moduleOptionMenu, $currentModuleID, "onchange='loadModuleRelated();' class='form-control chosen'"); if(count($moduleOptionMenu) == 1) { - echo ""; - echo html::a($this->createLink('tree', 'browse', "rootID=$productID&view=case¤tModuleID=0&branch=$branch"), $lang->tree->manage, '_blank'); - echo '  '; - echo html::a("javascript:loadProductModules($productID)", $lang->refresh); + echo ""; + echo html::a($this->createLink('tree', 'browse', "rootID=$productID&view=case¤tModuleID=0&branch=$branch"), "", '_blank', "data-toggle='tooltip' class='btn' title='{$lang->tree->manage}'"); + echo html::a("javascript:loadProductModules($productID)", "", '', "data-toggle='tooltip' class='btn' title='{$lang->refresh}'"); echo ''; } ?> @@ -77,19 +76,23 @@ testcase->title;?> -
        -
        - -
        -
        +
        +
        +
        - testcase->pri;?> - testcase->priList, $pri, "class='form-control'");?> + testcase->pri;?> +
        + +
          + testcase->priList, $pri, "class='hide'");?> +
          - + testcase->precondition;?> diff --git a/www/js/my.full.js b/www/js/my.full.js index 5e43f76527..f8eba7d31b 100644 --- a/www/js/my.full.js +++ b/www/js/my.full.js @@ -1479,8 +1479,9 @@ function initPrioritySelector() $('.dropdown-pris').each(function() { var $dropdown = $(this); + var prefix = $dropdown.data('prefix') || 'pri'; var $select = $dropdown.find('select'); - var selectVal = parseInt($select.val()); + var selectVal = parseInt($select.hide().val()); var $menu = $dropdown.children('.dropdown-menu'); if(!$menu.length) { @@ -1489,14 +1490,21 @@ function initPrioritySelector() } if(!$menu.children('li').length) { - var set = $dropdown.data('set').split(',') || [0,1,2,3,4]; + var set = $select.children('option').map(function() {return parseInt($(this).val());}).get(); + if(!set || !set.length) + { + set = $dropdown.data('set'); + set = set ? set.split(',') : [0,1,2,3,4]; + } + set.sort(); for(var i = 0; i < set.length; ++i) { - $menu.append('
        • ' + (i ? i : '') + '
          • '); + var v = set[i]; + $menu.append('
        • ' + (v ? v : '') + '
          • '); } } $menu.find('a[data-pri="' + selectVal + '"]').parent().addClass('active'); - $dropdown.find('.pri-text').html('' + (selectVal ? selectVal : '') + ''); + $dropdown.find('.pri-text').html('' + (selectVal ? selectVal : '') + ''); $dropdown.on('click', '.dropdown-menu > li > a', function() { @@ -1505,11 +1513,29 @@ function initPrioritySelector() $a.parent().addClass('active'); selectVal = $a.data('pri'); $select.val(selectVal); - $dropdown.find('.pri-text').html('' + (selectVal ? selectVal : '') + ''); + $dropdown.find('.pri-text').html('' + (selectVal ? selectVal : '') + ''); }); }); } +/** + * Apply cs style to page + * @return void + */ +function applyCssStyle(css, tag) +{ + tag = tag || 'default'; + var name = 'applyStyle-' + tag; + var $style = $('style#' + name); + if(!$style.length) + { + $style = $('