diff --git a/module/api/config.php b/module/api/config.php index c023e190d6..ca85343f71 100644 --- a/module/api/config.php +++ b/module/api/config.php @@ -24,6 +24,7 @@ $config->api->editor->createlib = array('id' => 'desc', 'tools' => 'simpleTo $config->api->editor->editlib = array('id' => 'desc', 'tools' => 'simpleTools'); $config->api->editor->create = array('id' => 'desc', 'tools' => 'simpleTools'); $config->api->editor->edit = array('id' => 'desc', 'tools' => 'simpleTools'); +$config->api->editor->view = array('id' => 'comment,lastComment', 'tools' => 'simple'); $config->api->editor->createRelease = array('id' => 'desc', 'tools' => 'simpleTools'); $config->api->editor->createstruct = array('id' => 'desc', 'tools' => 'simpleTools'); $config->api->editor->editstruct = array('id' => 'desc', 'tools' => 'simpleTools'); diff --git a/module/api/control.php b/module/api/control.php index 94a621c832..52a70894c4 100755 --- a/module/api/control.php +++ b/module/api/control.php @@ -195,7 +195,11 @@ class api extends control $this->view->libID = $libID; $this->view->apiID = $apiID; $this->view->crumbs = $crumbs; + $this->view->moduleID = $moduleID; + $this->view->objectType = $type; + $this->view->objectID = $this->objectID; $this->view->users = $this->user->getPairs('noclosed,noletter'); + $this->view->libTree = $this->doc->getLibTree($libID, $libs, 'api', $moduleID); $this->view->moduleTree = $this->doc->getApiModuleTree($libID, $apiID, $release, $moduleID); $this->view->objectDropdown = $this->generateLibsDropMenu($libs[$libID], $release); $this->display(); diff --git a/module/api/css/common.css b/module/api/css/common.css index d72371dec4..64b62e6825 100644 --- a/module/api/css/common.css +++ b/module/api/css/common.css @@ -163,3 +163,23 @@ form .table-data, #content .table-data {border: 1px solid #e2e2e3;} .info .version, .info .crumbs {float: left;} .info .crumbs {font-size: 13px; margin-top: 5px; font-weight: normal;} .info .crumbs img {margin-right: 3px;} + +.lib {width: unset; margin-bottom: unset;} +.flex {display: flex;} +.flex-none {flex: none;} +.flex-auto {flex: auto;} +.flex-full > .panel {box-shadow: none;} +.float-r {float: right;} +.h-full {height: 100%;} +.w-full {width: 100%;} +.overflow-x-auto {overflow-x: auto;} +.overflow-auto {overflow: auto;} +.overflow-visible {overflow: visible;} +.overflow-hidden {overflow: hidden;} +.img-lib {width: 14px; height: 14px; margin-bottom: 2px; flex: 0 0 14px;} +#mainContent {padding-top: 0; padding-bottom: 0;} +#mainContent #createDropdown {display: inline-block;} +#mainContent #createDropdown ul {position: absolute;} +#pageNav .dropdown-menu {max-height: inherit;} +#mainContent > .panel {margin-bottom: 0; height: calc(100vh - 125px); overflow-y: auto;} +#mainContent > .main-col {padding-left: 0;} diff --git a/module/api/css/index.css b/module/api/css/index.css index d1a2d2eb31..9c0cc48254 100644 --- a/module/api/css/index.css +++ b/module/api/css/index.css @@ -1,24 +1,4 @@ -.lib {width: unset; margin-bottom: unset;} -.flex {display: flex;} -.flex-none {flex: none;} -.flex-auto {flex: auto;} -.flex-full > .panel {box-shadow: none;} -.float-r {float: right;} -.h-full {height: 100%;} -.w-full {width: 100%;} -.overflow-x-auto {overflow-x: auto;} -.overflow-auto {overflow: auto;} -.overflow-visible {overflow: visible;} -.overflow-hidden {overflow: hidden;} -.img-lib {width: 14px; height: 14px; margin-bottom: 2px; flex: 0 0 14px;} .cell {padding: 0;} -#mainContent {padding-top: 0; padding-bottom: 0;} -#mainContent #createDropdown {display: inline-block;} -#mainContent #createDropdown ul {position: absolute;} -#pageNav .dropdown-menu {max-height: inherit;} -#mainContent > .panel {margin-bottom: 0; height: calc(100vh - 125px); overflow-y: auto;} -#mainContent > .main-col {padding-left: 0;} - .no-content {width: 100px; height: 100px; margin: 0 auto;} .notice {text-align: center; padding-left: 15px; padding-top: 20px;} .no-content-button {text-align: center; padding-top: 20px;} diff --git a/module/api/css/view.css b/module/api/css/view.css new file mode 100644 index 0000000000..003484f6cc --- /dev/null +++ b/module/api/css/view.css @@ -0,0 +1,11 @@ +.flex-content #content {flex: auto; overflow-y: auto; height: calc(100vh - 125px);} +.flex-content #history {flex: 0 0 302px; position: relative; overflow: auto;} +.flex-content #history > #closeBtn {position: absolute; right: 10px; top: 10px;} + +#content .detail-content.article-content::-webkit-scrollbar, +#outlineMenu::-webkit-scrollbar, +#history::-webkit-scrollbar {height: 0px; width: 0px; background: transparent;} +#content .detail-content.article-content::-moz-scrollbar, +#outlineMenu::-moz-scrollbar, +#hostory::-moz-scrollbar {height: 0px; width: 0px; background: transparent;} +.main-col iframe {min-height: unset;} diff --git a/module/api/js/view.js b/module/api/js/view.js index f32c457b49..b446307d5d 100644 --- a/module/api/js/view.js +++ b/module/api/js/view.js @@ -104,7 +104,7 @@ $(function() $('.menu-actions > a').blur(function() {$(this).css('background', 'none');}) /* Update doc content silently on switch doc version, story #40503 */ - $(document).on('click', '.api-version-menu a, #mainActions .container a', function(event) + $('body').on('click', '.api-version-menu a, #mainActions .container a', function(event) { var $tmpDiv = $('
'); $tmpDiv.load($(this).data('url') + ' #mainContent', function() @@ -117,5 +117,43 @@ $(function() $('#outline li.has-list').addClass('open in'); $('#outline li.has-list>i+ul').prev('i').remove(); }); + }).on('click', '.comment-edit-form .btn-hide-form', function() + { + $('.comment-edit-form #submit').attr('disabled', false); + }).on('click', '#docVersionMenu.diff > .drop-body > li', function(e) + { + e.stopPropagation(); + }).on('click', '#docVersionMenu #changeBtn', function(e) + { + $('#docVersionMenu').addClass('diff'); + e.stopPropagation(); + }).on('click', '#hisTrigger', function() + { + var $history = $('#history'); + var $icon = $(this); + if($history.hasClass('hidden')) + { + $history.removeClass('hidden'); + $icon.addClass('text-primary'); + } + else + { + $history.addClass('hidden'); + $icon.removeClass('text-primary'); + } + }).on('click', '#closeBtn', function() + { + $('#history').addClass('hidden'); + $('#hisTrigger').removeClass('text-primary'); }); + + $('#history').append(''); + + $('#history').find('.btn.pull-right').removeClass('pull-right'); + + $('.comment-edit-form').ajaxForm({ + success: function(data) { + location.reload(); + } + }) }); diff --git a/module/api/view/content.html.php b/module/api/view/content.html.php index 3c2742337c..d7330c62ce 100644 --- a/module/api/view/content.html.php +++ b/module/api/view/content.html.php @@ -1,5 +1,5 @@
-
+
@@ -20,7 +20,6 @@
-
', $crumbs);?>
', '', "title='{$lang->fullscreen}' class='btn btn-link fullscreen-btn'");?> @@ -31,6 +30,7 @@ if(common::hasPriv('api', 'delete')) echo html::a($this->createLink('api', 'delete', "apiID=$api->id"), '', '', "title='{$lang->api->delete}' class='btn btn-link' target='hiddenwin'"); } ?> + history?>>
@@ -146,53 +146,12 @@
- -
- createLink('action', 'comment', "objectType=api&objectID=$api->id");?> - -
- diff --git a/module/api/view/index.html.php b/module/api/view/index.html.php index 233b24e1dc..b05dfa4227 100644 --- a/module/api/view/index.html.php +++ b/module/api/view/index.html.php @@ -48,7 +48,7 @@
- +
diff --git a/module/api/view/view.html.php b/module/api/view/view.html.php index bba2365fc8..06b6fa30ad 100644 --- a/module/api/view/view.html.php +++ b/module/api/view/view.html.php @@ -11,48 +11,35 @@ */ ?> + api->confirmDelete);?> -
>
-
- - -
-
-
- - "; - echo html::a('javascript:;', "", '', "data-toggle='dropdown' class='btn btn-link'"); - echo "
'; - } - ?> -
- -
- -
api->noModule;?>
- - - -
+ + + +
+ + +
+
+
- -
diff --git a/module/doc/view/view.html.php b/module/doc/view/view.html.php index 7350a2c415..9b1d0e516d 100644 --- a/module/doc/view/view.html.php +++ b/module/doc/view/view.html.php @@ -23,9 +23,9 @@