diff --git a/module/bug/control.php b/module/bug/control.php index 42b968c58e..204e729d0d 100644 --- a/module/bug/control.php +++ b/module/bug/control.php @@ -428,7 +428,7 @@ class bug extends control setcookie('bugModule', 0, 0, $this->config->webRoot, '', $this->config->cookieSecure, false); $location = $this->createLink('bug', 'browse', "productID={$this->post->product}&branch=$branch&browseType=byModule¶m={$this->post->module}&orderBy=id_desc"); } - if($this->app->getViewType() == 'xhtml') $location = $this->createLink('bug', 'view', "bugID=$bugID"); + if($this->app->getViewType() == 'xhtml') $location = $this->createLink('bug', 'view', "bugID=$bugID", 'html'); $response['locate'] = $location; return $this->send($response); } diff --git a/module/bug/css/x.view.css b/module/bug/css/x.view.css index 9b840e4311..b18ef5ed1b 100644 --- a/module/bug/css/x.view.css +++ b/module/bug/css/x.view.css @@ -11,4 +11,3 @@ html, body, #main, .container { height: 100%;} .linkButton {float: right; padding-right: 10px; cursor: pointer;} .linkButton i {font-size: 17px !important;} .linkButton span {line-height: 34px; display: block;} -.modal-header .close {font-size: 32px !important}; diff --git a/module/doc/control.php b/module/doc/control.php index 3d78e6b352..f194a62cbd 100644 --- a/module/doc/control.php +++ b/module/doc/control.php @@ -309,7 +309,7 @@ class doc extends control if($this->viewType == 'json') return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'id' => $docID)); $objectID = zget($lib, $lib->type, ''); $params = "type={$lib->type}&objectID=$objectID&libID={$lib->id}&docID=" . $docResult['id']; - $link = isonlybody() ? 'parent' : $this->createLink('doc', 'objectLibs', $params); + $link = isonlybody() ? 'parent' : $this->createLink('doc', 'objectLibs', $params, 'html'); return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $link)); } diff --git a/module/story/control.php b/module/story/control.php index e01502b98a..10ed315954 100644 --- a/module/story/control.php +++ b/module/story/control.php @@ -181,7 +181,7 @@ class story extends control $param = $execution->type == 'project' ? "projectID=$objectID&productID=$productID" : "executionID=$objectID&orderBy=id_desc&browseType=unclosed"; $response['locate'] = $this->createLink($moduleName, 'story', $param); } - if($this->app->getViewType() == 'xhtml') $response['locate'] = $this->createLink('story', 'view', "storyID=$storyID"); + if($this->app->getViewType() == 'xhtml') $response['locate'] = $this->createLink('story', 'view', "storyID=$storyID", 'html'); return $this->send($response); } diff --git a/module/story/css/x.view.css b/module/story/css/x.view.css index 1012999457..dccc99b6bf 100644 --- a/module/story/css/x.view.css +++ b/module/story/css/x.view.css @@ -15,4 +15,3 @@ html, body, #main, .container { height: 100%;} .linkButton i {font-size: 17px !important;} .linkButton span {line-height: 34px; display: block;} .btn-toolbar {width: calc(100% - 30px);} -.modal-header .close {font-size: 32px !important}; diff --git a/module/task/control.php b/module/task/control.php index 69400b914e..5398ec2a83 100644 --- a/module/task/control.php +++ b/module/task/control.php @@ -146,7 +146,7 @@ class task extends control /* Locate the browser. */ if($this->app->getViewType() == 'xhtml') { - $taskLink = $this->createLink('task', 'view', "taskID=$taskID"); + $taskLink = $this->createLink('task', 'view', "taskID=$taskID", 'html'); $response['locate'] = $taskLink; return $this->send($response); } diff --git a/module/task/css/x.view.css b/module/task/css/x.view.css index 2c3c499cb8..5a96385b1f 100644 --- a/module/task/css/x.view.css +++ b/module/task/css/x.view.css @@ -15,4 +15,3 @@ html, body, #main, .container { height: 100%;} .linkButton i {font-size: 17px !important;} .linkButton span {line-height: 34px; display: block;} .btn-toolbar {width: calc(100% - 30px);} -.modal-header .close {font-size: 32px !important}; diff --git a/module/todo/control.php b/module/todo/control.php index d8dcb8f1c3..4cfe437bfd 100644 --- a/module/todo/control.php +++ b/module/todo/control.php @@ -69,7 +69,7 @@ class todo extends control } if($this->viewType == 'json') return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'id' => $todoID)); - if($this->viewType == 'xhtml') die(js::locate($this->createLink('todo', 'view', "todoID=$todoID"), 'parent')); + if($this->viewType == 'xhtml') die(js::locate($this->createLink('todo', 'view', "todoID=$todoID", 'html'), 'parent')); if(isonlybody()) die(js::closeModal('parent.parent')); die(js::locate($this->createLink('my', 'todo', "type=all&userID=&status=all&orderBy=id_desc"), 'parent')); }