Merge branch 'master' of github.com:easysoft/zentaopms

module/common/lang/en.php

@@ -126,11 +126,12 @@ $lang->exportTypeList['selected'] = 'Only checked';
 $lang->lang = 'Language';
 
 /* Themes. */
-$lang->theme               = 'Theme';
-$lang->themes['default']   = 'Default';
-$lang->themes['green']     = 'Green';
-$lang->themes['red']       = 'Red';
-$lang->themes['lightblue'] = 'Light Blue';
+$lang->theme                = 'Theme';
+$lang->themes['default']    = 'Default';
+$lang->themes['green']      = 'Green';
+$lang->themes['red']        = 'Red';
+$lang->themes['lightblue']  = 'Light Blue';
+$lang->themes['blackberry'] = 'Blackberry';
 
 /* Index mododule menu. */
 $lang->index = new stdclass();

module/common/lang/zh-cn.php

@@ -126,11 +126,12 @@ $lang->exportTypeList['selected'] = '选中记录';
 $lang->lang = 'Language';
 
 /* 风格列表。*/
-$lang->theme               = '主题';
-$lang->themes['default']   = '默认';
-$lang->themes['green']     = '绿色';
-$lang->themes['red']       = '红色';
-$lang->themes['lightblue'] = '亮蓝';
+$lang->theme                 = '主题';
+$lang->themes['default']     = '默认';
+$lang->themes['green']       = '绿色';
+$lang->themes['red']         = '红色';
+$lang->themes['lightblue']   = '亮蓝';
+$lang->themes['blackberry']  = '黑莓';
 
 /* 首页菜单设置。*/
 $lang->index = new stdclass();

module/common/lang/zh-tw.php

@@ -127,11 +127,12 @@ $lang->exportTypeList['selected'] = '選中記錄';
 $lang->lang = 'Language';
 
 /* 風格列表。*/
-$lang->theme               = '主題';
-$lang->themes['default']   = '預設';
-$lang->themes['green']     = '綠色';
-$lang->themes['red']       = '紅色';
-$lang->themes['lightblue'] = '亮藍';
+$lang->theme                = '主題';
+$lang->themes['default']    = '預設';
+$lang->themes['green']      = '綠色';
+$lang->themes['red']        = '紅色';
+$lang->themes['lightblue']  = '亮藍';
+$lang->themes['blackberry'] = '黑莓';
 
 /* 首頁菜單設置。*/
 $lang->index = new stdclass();

module/extension/js/common.js

@@ -1,5 +1,3 @@
-// if($('a.iframe').size()) $("a.iframe").colorbox({width:800, height:400, iframe:true, transition:'none', scrolling:true});
-// if($('a.manual').size()) $("a.manual").colorbox({width:1024, height:600, iframe:true, transition:'none', scrolling:false});
 $(function()
 {
     $("a.extension, a.manual").modalTrigger({width:1024, height:600, type:'iframe'});

module/user/css/login.css

@@ -1,4 +1,4 @@
-html,body{background-color: #036}
+body{background-color: #036}
 #container{margin: 10% auto 0 auto}
 #login-panel{margin: 0 auto;width: 540px;min-height: 280px;background-color: #fff;border: 1px solid #dfdfdf;-moz-border-radius:3px; -webkit-border-radius:3px; border-radius:3px;-moz-box-shadow:0px 0px 30px rgba(0,0,0,0.75); -webkit-box-shadow:0px 0px 30px rgba(0,0,0,0.75); box-shadow:0px 0px 30px rgba(0,0,0,0.75)}
 #login-panel .panel-head{min-height: 70px;background-color: #edf3fe;border-bottom: 1px solid #dfdfdf;position: relative}

www/js/my.full.js

@@ -796,11 +796,7 @@ function ajaxDelete(url, replaceID, notice)
                         {
                             sortTable(); 
                         }
-                        else
-                        {
-                            $('.colored').colorize();
-                            $('tfoot td').css('background', 'white').unbind('click').unbind('hover');
-                        }
+                        $('#' + replaceID).find('[data-toggle=modal], a.iframe').modalTrigger();
                     });
                 }
             }
@@ -1058,6 +1054,14 @@ function setModal()
     $.extend({modalTrigger: showIframeModal});
 
     $('[data-toggle=modal], a.iframe').modalTrigger();
+
+    jQuery.fn.colorbox = function(setting)
+    {
+        if((typeof setting == 'object') && setting.iframe)
+        {
+            $(this).modalTrigger({type: 'iframe', width: setting['width'], afterHide: setting['onCleanup'], url: setting['href']});
+        }
+    }
 }
 
 /**
@@ -1097,6 +1101,7 @@ function setModal4List(colorboxClass, replaceID, callback, width)
                     setModal4List(colorboxClass, replaceID, callback, width);
 
                     $('#' + replaceID + ' tbody tr:not(.active-disabled) td').click(function(){$(this).closest('tr').toggleClass('active');});
+                    $('#' + replaceID).find('[data-toggle=modal], a.iframe').modalTrigger();
                     try
                     {
                         $(".date").datetimepicker(datepickerOptions);
@@ -1128,6 +1133,8 @@ needPing = true;
 /* When body's ready, execute these. */
 $(document).ready(function() 
 {
+    $('body').addClass('m-{currentModule}-{currentMethod}'.format(config));
+
     setModal();
     setTableBehavior();
     setForm();

www/theme/default/style.css

@@ -389,7 +389,7 @@ body {font-size: 13px; color:#141414;padding-bottom: 40px;}
 #wrap .outer {position: relative; text-align:left; background:#fff;border:1px solid #cfcfcf; -webkit-box-shadow: 0 0px 6px rgba(0, 0, 0, 0.10);box-shadow: 0 0px 6px rgba(0, 0, 0, 0.10); padding: 20px}
 
 /* Footer. */
-#footer {position: relative; width:100%;position:fixed; bottom:0; left:0; margin:0; border-top: 1px solid #e1e1e1; background:#eef4fe;height:40px; line-height:40px;-webkit-box-shadow: 0 -2px 5px rgba(0, 0, 0, 0.1);box-shadow: 0 -2px 5px rgba(0, 0, 0, 0.1);}
+#footer {position: relative; width:100%;position:fixed; bottom:0; left:0; margin:0; border-top: 1px solid #e1e1e1; background:#eef4fe;height:40px; line-height:40px;-webkit-box-shadow: 0 -2px 5px rgba(0, 0, 0, 0.1);box-shadow: 0 -2px 5px rgba(0, 0, 0, 0.1); z-index: 10}
 #crumbs a i.icon-home{display: none;}
 #crumbs {float: left;margin-left: 20px;}
 #crumbs .icon-angle-right{margin-right: 6px;}