diff --git a/lib/front/front.class.php b/lib/front/front.class.php index 07a5c3b4d7..01ff9be60f 100644 --- a/lib/front/front.class.php +++ b/lib/front/front.class.php @@ -759,6 +759,7 @@ EOT; /** * Close colorbox in javascript. + * This is a obsolete method, you can use 'closeModal' instead. * * @param string $window * @static @@ -766,10 +767,23 @@ EOT; * @return void */ static public function closeColorbox($window = 'self') + { + return self::closeModal($window); + } + + /** + * Close modal with javascript. + * + * @param string $window + * @static + * @access public + * @return void + */ + static public function closeModal($window = 'self') { $js = self::start(); $js .= "if($window.location.href == self.location.href){ $window.window.close();}"; - $js .= "else{ $window.$.cookie('selfClose', 1);$window.$.colorbox.close();}"; + $js .= "else{ $window.$.cookie('selfClose', 1);$window.$.closeModal();}"; $js .= self::end(); return $js; } diff --git a/module/bug/control.php b/module/bug/control.php index b25f1db0d5..8bf0f78175 100644 --- a/module/bug/control.php +++ b/module/bug/control.php @@ -628,7 +628,7 @@ class bug extends control $this->action->logHistory($actionID, $changes); $this->sendmail($bugID, $actionID); - if(isonlybody()) die(js::closeColorbox('parent.parent')); + if(isonlybody()) die(js::closeModal('parent.parent')); die(js::locate($this->createLink('bug', 'view', "bugID=$bugID"), 'parent')); } @@ -657,7 +657,7 @@ class bug extends control if(dao::isError()) die(js::error(dao::getError())); $actionID = $this->action->create('bug', $bugID, 'bugConfirmed', $this->post->comment); $this->sendmail($bugID, $actionID); - if(isonlybody()) die(js::closeColorbox('parent.parent')); + if(isonlybody()) die(js::closeModal('parent.parent')); die(js::locate($this->createLink('bug', 'view', "bugID=$bugID"), 'parent')); } @@ -716,7 +716,7 @@ class bug extends control $confirmURL = $this->createLink('task', 'view', "taskID=$bug->toTask"); echo js::confirm(sprintf($this->lang->bug->remindTask, $bug->toTask), $confirmURL, '', 'parent'); } - if(isonlybody()) die(js::closeColorbox('parent.parent')); + if(isonlybody()) die(js::closeModal('parent.parent')); die(js::locate($this->createLink('bug', 'view', "bugID=$bugID"), 'parent')); } @@ -772,7 +772,7 @@ class bug extends control $files = $this->loadModel('file')->saveUpload('bug', $bugID); $actionID = $this->action->create('bug', $bugID, 'Activated', $this->post->comment); $this->sendmail($bugID, $actionID); - if(isonlybody()) die(js::closeColorbox('parent.parent')); + if(isonlybody()) die(js::closeModal('parent.parent')); die(js::locate($this->createLink('bug', 'view', "bugID=$bugID"), 'parent')); } @@ -807,7 +807,7 @@ class bug extends control if(dao::isError()) die(js::error(dao::getError())); $actionID = $this->action->create('bug', $bugID, 'Closed', $this->post->comment); $this->sendmail($bugID, $actionID); - if(isonlybody()) die(js::closeColorbox('parent.parent')); + if(isonlybody()) die(js::closeModal('parent.parent')); die(js::locate($this->createLink('bug', 'view', "bugID=$bugID"), 'parent')); } diff --git a/module/bug/css/view.css b/module/bug/css/view.css index 91f0e7ffd6..9dbb2122ba 100644 --- a/module/bug/css/view.css +++ b/module/bug/css/view.css @@ -1 +1 @@ -.content .stepTitle{margin:7px 0 7px -15px; display:block; color: green} +.content .stepTitle{display:block; color: green} diff --git a/module/bug/js/browse.js b/module/bug/js/browse.js index 982b495d3e..9e431dc374 100644 --- a/module/bug/js/browse.js +++ b/module/bug/js/browse.js @@ -1,6 +1,5 @@ $(document).ready(function() { - $("a.customFields").colorbox({width:680, height:400, iframe:true, transition:'none'}); $('#' + browseType + 'Tab').addClass('active'); $('#module' + moduleID).addClass('active'); if(browseType == 'bysearch') ajaxGetSearchForm(); diff --git a/module/bug/js/view.js b/module/bug/js/view.js index 8c6f398c62..34bfab7a67 100644 --- a/module/bug/js/view.js +++ b/module/bug/js/view.js @@ -1,3 +1,4 @@ function setModal4List(colorboxClass, replaceID) { + if(onlybody != 'yes') $('.iframe').modalTrigger({width:900, height:500, type:'iframe', afterHide:function(){parent.location.href=parent.location.href;}}) } diff --git a/module/bug/view/activate.html.php b/module/bug/view/activate.html.php index 4e50af47e4..a3da5ea551 100644 --- a/module/bug/view/activate.html.php +++ b/module/bug/view/activate.html.php @@ -12,20 +12,28 @@ ?> -
- - + +
+
+ icons['bug']) . ' #' . $bug->id;;?> + createLink('bug', 'view', 'bug=' . $bug->id), $bug->title, '_blank');?> + bug->activate;?> icons['activate']);?> +
+
+ + +
title;?>
- - + + - + + @@ -35,6 +43,8 @@
bug->assignedTo;?> + bug->assignedTo;?> resolvedBy, "class='form-control'");?>
bug->openedBuild;?> - openedBuild, 'size=4 multiple=multiple class=select-3');?>bug->openedBuild;?>openedBuild, 'size=4 multiple=multiple class="form-control chosen"');?>
comment;?> - comment;?>
bug->files;?>goback, $this->session->bugList);?>
-
+
+ +
diff --git a/module/bug/view/customfields.html.php b/module/bug/view/customfields.html.php index f4e55fc063..bc6563e616 100644 --- a/module/bug/view/customfields.html.php +++ b/module/bug/view/customfields.html.php @@ -11,7 +11,6 @@ */ ?> -
icons['bug']);?> diff --git a/module/common/view/chosen.html.php b/module/common/view/chosen.html.php index 2df6d3595c..94e9ae9572 100755 --- a/module/common/view/chosen.html.php +++ b/module/common/view/chosen.html.php @@ -6,9 +6,6 @@ if($config->debug) js::import($jsRoot . 'jquery/chosen/min.js'); } ?> - diff --git a/module/editor/js/index.js b/module/editor/js/index.js index 350e6cbea7..96c6236e7f 100644 --- a/module/editor/js/index.js +++ b/module/editor/js/index.js @@ -5,5 +5,4 @@ $(function() $('#extendWin').height(showHeight); $('.panel a.list-group-item').click(function(){$('.panel a.list-group-item.active').removeClass('active'); $(this).addClass('active')}); - if($('a.iframe').size()) $("a.iframe").colorbox({width:800, height:400, iframe:true, transition:'none', scrolling:true}); }); diff --git a/module/extension/js/common.js b/module/extension/js/common.js index 148f445e1b..1f03c8e032 100644 --- a/module/extension/js/common.js +++ b/module/extension/js/common.js @@ -2,5 +2,5 @@ // if($('a.manual').size()) $("a.manual").colorbox({width:1024, height:600, iframe:true, transition:'none', scrolling:false}); $(function() { - $("a.extension").modalTrigger({width:1024, height:600, type:'iframe'}); + $("a.extension, a.manual").modalTrigger({width:1024, height:600, type:'iframe'}); }) diff --git a/module/file/view/edit.html.php b/module/file/view/edit.html.php index 9ba916f72f..4296a49f9d 100644 --- a/module/file/view/edit.html.php +++ b/module/file/view/edit.html.php @@ -11,7 +11,6 @@ */ ?> - @@ -25,7 +24,7 @@ function setFileName() function closeWindow() { - parent.$.fn.colorbox.close(); + parent.$.closeModal(); clearInterval(time); } diff --git a/module/file/view/export.html.php b/module/file/view/export.html.php index d067c8fea0..899f79a834 100644 --- a/module/file/view/export.html.php +++ b/module/file/view/export.html.php @@ -11,7 +11,6 @@ */ ?> - diff --git a/module/release/js/common.js b/module/release/js/common.js index 57e6407d9c..9eb8f53dd8 100644 --- a/module/release/js/common.js +++ b/module/release/js/common.js @@ -3,11 +3,11 @@ function loadStoriesAndBugs(buildID,productID) link = createLink('release', 'ajaxGetStoriesAndBugs', 'buildID=' + buildID + '&productID=' + productID); $('#linkStoriesAndBugs').load(link, function() { - $("a.preview").colorbox({width:1000, height:550, iframe:true, transition:'none', scrolling:true}); + $("a.preview").modalTrigger({width:1000, type:'iframe'}); }) } $(document).ready(function() { - $("a.preview").colorbox({width:1000, height:550, iframe:true, transition:'none', scrolling:true}); + $("a.preview").modalTrigger({width:1000, type:'iframe'}); }) diff --git a/module/release/view/export.html.php b/module/release/view/export.html.php index 31d5458683..ba9f37f4e7 100755 --- a/module/release/view/export.html.php +++ b/module/release/view/export.html.php @@ -11,7 +11,6 @@ */ ?> -