diff --git a/module/doc/css/view.css b/module/doc/css/view.css index 1d63e1f258..dae15f935d 100644 --- a/module/doc/css/view.css +++ b/module/doc/css/view.css @@ -25,6 +25,12 @@ .article-content .info .keywords .label {padding-right:8px; padding-left:8px; color:#18A6FD; border-color:rgba(24, 166, 253, 0.25); height:22px; line-height:14px; margin-right:4px;} .article-content {width: 100%; display: inline-block;} +.article-content.comment .comment-content {width: 94%;} +#outlineMenu {max-width: 200px;} +#outlineMenu .tree li > a {text-overflow: clip;} +.outline-toggle {position: absolute; right: 20px; top: 50px;} +.outline-toggle i.icon-angle-right:before {content: "\e314"; cursor: pointer;} +.outline-toggle i.icon-angle-left:before {content: "\e315"; cursor: pointer;} .outline-toggle {position: absolute; right: 55px; top: 50px;} .outline ul li {list-style: none;} .outline-content {display: none; padding-top: 18px;} diff --git a/module/doc/js/view.js b/module/doc/js/view.js index f49bad1fed..cd4a32e3cf 100644 --- a/module/doc/js/view.js +++ b/module/doc/js/view.js @@ -8,6 +8,12 @@ $(function() }) $('.menu-actions > a').blur(function() {$(this).css('background', 'none');}) + + $('.comment-edit-form').ajaxForm({ + success: function(data) { + location.reload(); + } + }) }) /** diff --git a/module/doc/view/content.html.php b/module/doc/view/content.html.php index 4c2735ae26..26e1f012c1 100644 --- a/module/doc/view/content.html.php +++ b/module/doc/view/content.html.php @@ -28,7 +28,6 @@
- doc->diff?> ', '', "title='{$lang->fullscreen}' class='btn btn-link fullscreen-btn'");?> collector, ',' . $this->app->user->account . ',') !== false ? 'star' : 'star-empty';?> diff --git a/module/gitlab/model.php b/module/gitlab/model.php index f83126aaaf..9c0e529751 100644 --- a/module/gitlab/model.php +++ b/module/gitlab/model.php @@ -1020,16 +1020,17 @@ class gitlabModel extends model /** * Get single project by API. * - * @param int $gitlabID - * @param int $projectID + * @param int $gitlabID + * @param int $projectID + * @param bool $useUser * @access public * @return object */ - public function apiGetSingleProject($gitlabID, $projectID) + public function apiGetSingleProject($gitlabID, $projectID, $useUser = false) { if(isset($this->projects[$gitlabID][$projectID])) return $this->projects[$gitlabID][$projectID]; - $url = sprintf($this->getApiRoot($gitlabID, false), "/projects/$projectID"); + $url = sprintf($this->getApiRoot($gitlabID, $useUser), "/projects/$projectID"); $this->projects[$gitlabID][$projectID] = json_decode(commonModel::http($url, $data = null, $optionsi = array(), $headers = array(), $dataType = 'data', $method = 'POST', $timeout = 30, $httpCode = false, $log = false)); return $this->projects[$gitlabID][$projectID]; } diff --git a/module/mr/control.php b/module/mr/control.php index 503fd7c6cc..6d5f6e3b4d 100644 --- a/module/mr/control.php +++ b/module/mr/control.php @@ -960,7 +960,7 @@ class mr extends control $projects = $scm == 'gitlab' ? $this->$scm->apiGetForks($hostID, $projectID) : array(); /* Second step: get project itself. */ - $projects[] = $this->$scm->apiGetSingleProject($hostID, $projectID); + $projects[] = $this->$scm->apiGetSingleProject($hostID, $projectID, true); /* Last step: find its upstream recursively. */ $project = $this->$scm->apiGetUpstream($hostID, $projectID);