From a69a464d8d13e2c0651288aa3a27040a5c936d5a Mon Sep 17 00:00:00 2001 From: Catouse Date: Fri, 2 May 2014 14:38:06 +0800 Subject: [PATCH] * fixed style for ie8. --- module/common/model.php | 4 ++-- module/file/view/export.html.php | 11 ++--------- module/my/css/todo.css | 2 ++ module/my/view/todo.html.php | 9 +++++---- module/search/view/buildform.html.php | 1 - module/todo/lang/zh-cn.php | 2 +- module/todo/view/create.html.php | 3 --- module/todo/view/footer.html.php | 4 ---- www/js/my.full.js | 4 ++-- 9 files changed, 14 insertions(+), 26 deletions(-) diff --git a/module/common/model.php b/module/common/model.php index 8ba996e82d..373ba7bbd0 100644 --- a/module/common/model.php +++ b/module/common/model.php @@ -253,7 +253,7 @@ class commonModel extends model echo "
  • " . $value . "
    • "; } echo ''; - + echo ''; if($isGuest) @@ -569,7 +569,7 @@ class commonModel extends model $notifyFile = $app->getBasePath() . 'www/data/notify/notify.zip'; if(!file_exists($notifyFile)) return false; - echo html::a(helper::createLink('misc', 'downNotify'), $lang->downNotify); + html::a(helper::createLink('misc', 'downNotify'), " " . $lang->downNotify) . '   '; } } diff --git a/module/file/view/export.html.php b/module/file/view/export.html.php index 9261bf8dea..bb0e6e3376 100644 --- a/module/file/view/export.html.php +++ b/module/file/view/export.html.php @@ -32,14 +32,7 @@ function closeWindow() } function switchEncode(fileType) { - if(fileType == 'csv') - { - $('#encode').removeAttr('class'); - } - else - { - $('#encode').attr('class', 'hidden'); - } + $('#encode').toggleClass('hidden', fileType != 'csv'); }
    @@ -61,7 +54,7 @@ function switchEncode(fileType) exportFileTypeList, '', 'onchange=switchEncode(this.value) class="form-control"');?> - charsets[$this->cookie->lang], 'utf-8', key($lang->exportFileTypeList) == 'csv' ? "class='form-control'" : "class='hidden'");?> + charsets[$this->cookie->lang], 'utf-8', key($lang->exportFileTypeList) == 'csv' ? "class='form-control'" : "class='form-control hidden'");?> exportTypeList, ($this->cookie->checkedItem) ? 'selected' : 'all', "class='form-control'");?> diff --git a/module/my/css/todo.css b/module/my/css/todo.css index e69de29bb2..8120d0e183 100644 --- a/module/my/css/todo.css +++ b/module/my/css/todo.css @@ -0,0 +1,2 @@ +.input-group .datepicker-wrapper{width: 110px!important;} +.input-group .datepicker-wrapper .form-control {max-width: 110px; line-height: 25px} diff --git a/module/my/view/todo.html.php b/module/my/view/todo.html.php index 6983bc5443..7324befd6f 100644 --- a/module/my/view/todo.html.php +++ b/module/my/view/todo.html.php @@ -119,11 +119,12 @@ if(common::hasPriv('todo', 'import2Today') and $importFuture) { $actionLink = $this->createLink('todo', 'import2Today'); - echo "
    "; - echo html::commonButton($lang->todo->import, "onclick=\"setFormAction('$actionLink')\"", '', 'signin'); - echo ''; + echo "
    "; echo "
    " . html::input('date', date('Y-m-d'), "class='form-control form-date'") . '
    '; - echo '
    '; + echo ""; + echo html::commonButton($lang->todo->import, "onclick=\"setFormAction('$actionLink')\""); + echo ''; + echo '
    '; } ?>
    diff --git a/module/search/view/buildform.html.php b/module/search/view/buildform.html.php index b17bcd184c..cf696aecff 100644 --- a/module/search/view/buildform.html.php +++ b/module/search/view/buildform.html.php @@ -101,7 +101,6 @@ function setDateField(query, fieldNO) var target = $('#' + $period.data('target')); if(target.length) { - console.log($(this).attr('href')); target.val($(this).attr('href').replace('#', '$')); $('#operator' + $period.data('fieldNO')).val('between'); $period.hide(); diff --git a/module/todo/lang/zh-cn.php b/module/todo/lang/zh-cn.php index 026de5bbcf..adc394349a 100644 --- a/module/todo/lang/zh-cn.php +++ b/module/todo/lang/zh-cn.php @@ -23,7 +23,7 @@ $lang->todo->export = "导出"; $lang->todo->delete = "删除待办"; $lang->todo->browse = "浏览待办"; $lang->todo->import2Today = "导入到今天"; -$lang->todo->import = "导入到"; +$lang->todo->import = "导入"; $lang->todo->changeStatus = "更改"; $lang->todo->id = '编号'; diff --git a/module/todo/view/create.html.php b/module/todo/view/create.html.php index 13bf5a032e..2832aa5f18 100644 --- a/module/todo/view/create.html.php +++ b/module/todo/view/create.html.php @@ -79,7 +79,4 @@ diff --git a/module/todo/view/footer.html.php b/module/todo/view/footer.html.php index 11d28e20a5..eaf87639f1 100644 --- a/module/todo/view/footer.html.php +++ b/module/todo/view/footer.html.php @@ -11,9 +11,6 @@ function loadList(type, id) { divClass = '.nameBox'; divID = '#nameBox'; - } - console.log("divClass:"+divClass); - console.log("divID:"+divID); customHtml = $(divID).html(); if(type == 'bug') @@ -39,7 +36,6 @@ function loadList(type, id) } } - console.log("link:"+link); if(type == 'bug' || type == 'task') { $(divClass).load(link); diff --git a/www/js/my.full.js b/www/js/my.full.js index 8cc887262e..99def66d33 100644 --- a/www/js/my.full.js +++ b/www/js/my.full.js @@ -982,7 +982,7 @@ function setModal() if(location == 'this') window.location.reload(); else window.location = location; } - callback(); + if(callback && $.isFunction(callback)) callback(); }); $ajaxModal.modal('hide'); }}); @@ -1087,7 +1087,7 @@ $(document).ready(function() if(needPing) setTimeout('setPing()', 1000 * 60); // After 5 minutes, begin ping. - $('.export').bind('mousedown', function() + $('.export').bind('click', function() { var checkeds = ''; $(':checkbox').each(function()