From c3890aba120eb88798fc1c6f5e8e0bcf6d031271 Mon Sep 17 00:00:00 2001 From: Catouse Date: Thu, 24 Apr 2014 10:25:50 +0800 Subject: [PATCH] * ajusted style of dialog showing after create project. * ajusted style of dropdown menu on 'modulemenu'. --- module/product/view/ajaxgetdropmenu.html.php | 4 ++-- module/product/view/ajaxgetmatcheditems.html.php | 2 +- module/project/css/create.css | 9 --------- module/project/view/create.html.php | 5 +---- module/project/view/tips.html.php | 12 ++++++------ www/js/my.full.js | 3 +-- www/theme/default/style.css | 2 +- 7 files changed, 12 insertions(+), 25 deletions(-) diff --git a/module/product/view/ajaxgetdropmenu.html.php b/module/product/view/ajaxgetdropmenu.html.php index 711941f5fb..5ab2250060 100644 --- a/module/product/view/ajaxgetdropmenu.html.php +++ b/module/product/view/ajaxgetdropmenu.html.php @@ -23,12 +23,12 @@ { if($product->status == 'normal' and $product->PO == $this->app->user->account) { - echo "
  • " . html::a(sprintf($link, $product->id), " " . $product->name, '', "class='mine'"). "
    • "; + echo "
  • " . html::a(sprintf($link, $product->id), " " . $product->name, '', "class='mine text-important'"). "
    • "; } } if($iCharges and $others) echo "
  • {$lang->product->other}
    • "; - $class = ($iCharges and $others) ? "class='other'" : ''; + $class = ($iCharges and $others) ? "class='other text-special'" : ''; foreach($products as $product) { if($product->status == 'normal' and !($product->PO == $this->app->user->account)) diff --git a/module/product/view/ajaxgetmatcheditems.html.php b/module/product/view/ajaxgetmatcheditems.html.php index 145e5849f4..e7301b5b00 100644 --- a/module/product/view/ajaxgetmatcheditems.html.php +++ b/module/product/view/ajaxgetmatcheditems.html.php @@ -3,7 +3,7 @@ " . html::a(sprintf($link, $product->id), $product->name). ""; + echo "
  • " . html::a(sprintf($link, $product->id), " " . $product->name). "
    • "; } ?> diff --git a/module/project/css/create.css b/module/project/css/create.css index 19ef722026..3dfeaea03d 100644 --- a/module/project/css/create.css +++ b/module/project/css/create.css @@ -1,10 +1 @@ #tipsModal {margin-top: 10%;} -#copyProjects {padding: 0} -#copyProjects {padding: 0 2px} -#copyProjects > div {position: relative;} -#copyProjects a {display: block; min-height: 30px; line-height: 30px; padding: 5px 15px; border: 1px solid #e5e5e5; color: #333; margin: 5px 0} -#copyProjects a > i {display: inline-block; margin-right: 5px;} -#copyProjects a:hover {border:1px solid #39B3D7; background-color: #E5F9FF; text-decoration: none} -#copyProjects a.active {border-color: #229F24; color: #229F24; background-color: #E5FFE6} -#copyProjects a.active:after {position: absolute; content: '\e60d'; font-family: ZenIcon; font-size: 20px; right: 25px;} -#copyProjects a.cancel {color: #D2322D} diff --git a/module/project/view/create.html.php b/module/project/view/create.html.php index 2f3874dfd8..dd4600b635 100644 --- a/module/project/view/create.html.php +++ b/module/project/view/create.html.php @@ -17,14 +17,11 @@ diff --git a/module/project/view/tips.html.php b/module/project/view/tips.html.php index 264b96657b..c1e1830c51 100644 --- a/module/project/view/tips.html.php +++ b/module/project/view/tips.html.php @@ -1,9 +1,9 @@ -
    +
    project->afterInfo;?>
    -
    - createLink('project', 'team', "projectID=$projectID"), $lang->project->setTeam . " ", '', "class='list-group-item'");?> - createLink('project', 'linkstory', "projectID=$projectID"), $lang->project->linkStory . " ", '', "class='list-group-item'");?> - createLink('task', 'create', "project=$projectID"), $lang->project->createTask . " ", '', "class='list-group-item'");?> - createLink('project', 'task', "projectID=$projectID"), $lang->project->goback . " ", '', "class='list-group-item'");?> +
    + createLink('project', 'team', "projectID=$projectID"), $lang->project->setTeam, '', "class='btn'");?> + createLink('project', 'linkstory', "projectID=$projectID"), $lang->project->linkStory, '', "class='btn'");?> + createLink('task', 'create', "project=$projectID"), $lang->project->createTask, '', "class='btn'");?> + createLink('project', 'task', "projectID=$projectID"), $lang->project->goback, '', "class='btn'");?>
    diff --git a/www/js/my.full.js b/www/js/my.full.js index 168d9dc599..104586b263 100644 --- a/www/js/my.full.js +++ b/www/js/my.full.js @@ -104,7 +104,7 @@ function showDropMenu(objectType, objectID, module, method, extra) */ function showDropResult(objectType, objectID, module, method, extra) { - $('#resultList').load(createLink(objectType, 'ajaxGetDropMenu', "objectID=" + objectID + "&module=" + module + "&method=" + method + "&extra=" + extra) + ' #searchResult'); + $.get(createLink(objectType, 'ajaxGetDropMenu', "objectID=" + objectID + "&module=" + module + "&method=" + method + "&extra=" + extra), function(data){ $('#dropMenu').html(data).find('#search').focus();}); } /** @@ -125,7 +125,6 @@ function searchItems(keywords, objectType, objectID, module, method, extra) { showMenu = 0; showDropResult(objectType, objectID, module, method, extra); - setTimeout(function(){$("#dropMenu #search").focus();}, 300); } else { diff --git a/www/theme/default/style.css b/www/theme/default/style.css index c18d525fc4..60f0eed66f 100644 --- a/www/theme/default/style.css +++ b/www/theme/default/style.css @@ -325,7 +325,7 @@ body {font-size: 13px; color:#141414;padding-bottom: 40px;} #defaultMenu > ul, #moreMenu > ul {display: block; position: relative; padding: 0;} #moreMenu > ul {margin-left: 30px;} #defaultMenu > ul > li:first-child, #moreMenu > ul > li:first-child, #searchResult > ul > li:first-child {margin-top: 10px; border-top: 1px dashed #ddd} -#defaultMenu > ul > li, #moreMenu > ul > li,#searchResult > ul > li {display: block; float: none; margin: 0 -15px; padding: 2px 10px; border-bottom: 1px dashed #ddd;} +#defaultMenu > ul > li, #moreMenu > ul > li,#searchResult > ul > li {display: block; float: none; margin: 0 -15px; padding: 2px 15px; border-bottom: 1px dashed #ddd;} #defaultMenu > ul > li:hover, #defaultMenu > .actions > a:hover, #moreMenu > ul > li:hover, #searchResult > ul > li:hover {background: #f1f1f1} #defaultMenu > ul > li > a, #moreMenu > ul > li > a, #searchResult > ul > li > a {line-height: 24px; display: block;} #moreMenu > ul > li > a {color: #808080}