@@ -82,7 +82,7 @@
- id&objectType=doc");?>" title="" class='btn btn-link ajaxCollect'>
+ id&objectType=doc");?>" title="" class='btn btn-link ajaxCollect'>
id&comment=false", "", '', "title='{$lang->edit}' class='btn btn-link'", true, false)?>
id&confirm=no", "", 'hiddenwin', "title='{$lang->delete}' class='btn btn-link'")?>
diff --git a/module/doc/view/content.html.php b/module/doc/view/content.html.php
index 477a72a53b..0f17132791 100644
--- a/module/doc/view/content.html.php
+++ b/module/doc/view/content.html.php
@@ -40,8 +40,8 @@
}
?>
- collector, ',' . $this->app->user->account . ',') !== false ? 'icon-star text-yellow' : 'icon-star-empty';?>
- id&objectType=doc");?>" title="doc->collect;?>" class='ajaxCollect btn btn-link'>
+ collector, ',' . $this->app->user->account . ',') !== false ? 'star' : 'star-empty';?>
+ id&objectType=doc");?>" title="doc->collect;?>" class='ajaxCollect btn btn-link'>
config->edition == 'max' and $this->app->tab == 'project'):?>
diff --git a/module/doc/view/createlib.html.php b/module/doc/view/createlib.html.php
index f7aa4f2c88..045df03fbf 100644
--- a/module/doc/view/createlib.html.php
+++ b/module/doc/view/createlib.html.php
@@ -13,6 +13,12 @@
+
+
+
+
+
+
@@ -25,14 +31,14 @@
| doc->{$type}?> |
- |
+ |
tab == 'doc' and $type == 'project'):?>
| doc->execution?> |
multiple ? '' : 'disabled';?>
- doclib->tip->selectExecution}' $disabled")?>
+ doclib->tip->selectExecution}' $disabled")?>
|
diff --git a/module/doc/view/doclist.html.php b/module/doc/view/doclist.html.php
index 6fc6bb54b8..8011f71e4a 100644
--- a/module/doc/view/doclist.html.php
+++ b/module/doc/view/doclist.html.php
@@ -64,7 +64,7 @@ body {margin-bottom: 25px;}
- collector, ',' . $this->app->user->account . ',') !== false ? 'icon-star text-yellow' : 'icon-star-empty';?>
+ collector, ',' . $this->app->user->account . ',') !== false ? 'star' : 'star-empty';?>
collector, ',' . $this->app->user->account . ',') !== false ? $lang->doc->cancelCollection : $lang->doc->collect;?>
{$type}) ? $doc->{$type} : 0;?>
@@ -93,7 +93,7 @@ body {margin-bottom: 25px;}
?>
status == 'draft') echo "{$lang->doc->draft}";?>
- id&objectType=doc");?>" title="" class='btn btn-link ajaxCollect'>
+ id&objectType=doc");?>" title="" class='btn btn-link ajaxCollect'>
| addedBy);?> |
diff --git a/module/doc/view/lefttree.html.php b/module/doc/view/lefttree.html.php
new file mode 100644
index 0000000000..c9bd3a5cf3
--- /dev/null
+++ b/module/doc/view/lefttree.html.php
@@ -0,0 +1,480 @@
+
+
+
+
+
+
+ execution->common?>
+
+
+
+
+
+
+
+
+
+
diff --git a/module/doc/view/showfiles.html.php b/module/doc/view/showfiles.html.php
index 300416d0c7..d95fd05250 100644
--- a/module/doc/view/showfiles.html.php
+++ b/module/doc/view/showfiles.html.php
@@ -20,12 +20,13 @@
app->tab);?>
+
diff --git a/module/doc/view/tablecontents.html.php b/module/doc/view/tablecontents.html.php
index e2683fc202..d8c5109f0f 100644
--- a/module/doc/view/tablecontents.html.php
+++ b/module/doc/view/tablecontents.html.php
@@ -67,7 +67,7 @@
@@ -89,40 +89,4 @@
-
-
-
-
-
diff --git a/module/mr/js/diff.js b/module/mr/js/diff.js
index 791a2225a1..37a53877c1 100644
--- a/module/mr/js/diff.js
+++ b/module/mr/js/diff.js
@@ -133,7 +133,7 @@ function getDiffs(fileName)
function createTab(filename, filepath)
{
$('[data-path="' + decodeURIComponent(filepath) + '"]').closest('li').addClass('selected');
- var tabID = Base64.encode(filepath).replaceAll('=', '-');
+ var tabID = Base64.encode(filepath).replace(/=/g, '-');
return {
title: filename,
id: tabID,
@@ -200,7 +200,7 @@ $(document).ready(function()
/* Remove file path for opened files. */
$('#fileTabs').on('onClose', function(event, tab) {
- var filepath = decodeURIComponent(Base64.decode(tab.id.replaceAll('-', '=')));
+ var filepath = decodeURIComponent(Base64.decode(tab.id.replace(/-/g, '=')));
var index = openedFiles.indexOf(filepath);
if(index > -1)
{
@@ -213,7 +213,7 @@ $(document).ready(function()
/* Append file path into the title. */
$('#fileTabs').on('onLoad', function(event, tab) {
- var filepath = decodeURIComponent(Base64.decode(tab.id.replaceAll('-', '=')));
+ var filepath = decodeURIComponent(Base64.decode(tab.id.replace(/-/g, '=')));
$('#tab-nav-item-' + tab.id).attr('title', filepath);
document.getElementById('tab-iframe-' + tab.id).contentWindow.updateEditorInline(diffAppose);
@@ -221,7 +221,7 @@ $(document).ready(function()
});
$('#fileTabs').on('onOpen', function(event, tab) {
- var filepath = decodeURIComponent(Base64.decode(tab.id.replaceAll('-', '=')));
+ var filepath = decodeURIComponent(Base64.decode(tab.id.replace(/-/g, '=')));
var index = openedFiles.indexOf(filepath);
if(index > -1) document.getElementById('tab-iframe-' + tab.id).contentWindow.updateEditorInline(diffAppose);
});
diff --git a/module/my/css/doc.css b/module/my/css/doc.css
index cf7292e208..9fad24d9d2 100644
--- a/module/my/css/doc.css
+++ b/module/my/css/doc.css
@@ -1 +1,2 @@
.fullscreen-close {top: 8px !important;}
+.btn.ajaxCollect > img {width: 20px;}
diff --git a/module/my/js/doc.js b/module/my/js/doc.js
index ef9e5db6f3..7d99c02b41 100644
--- a/module/my/js/doc.js
+++ b/module/my/js/doc.js
@@ -5,14 +5,11 @@ $('.ajaxCollect').click(function (event) {
{
if(response.status == 'yes')
{
- obj.children('i').removeClass().addClass('icon icon-star text-yellow');
- obj.parent().prev().children('.file-name').children('i').remove('.icon');
- obj.parent().prev().children('.file-name').prepend(' ');
+ obj.children('img').attr('src', 'static/svg/star.svg');
}
else
{
- obj.children('i').removeClass().addClass('icon icon-star-empty');
- obj.parent().prev().children('.file-name').children('i').remove(".icon");
+ obj.children('img').attr('src', 'static/svg/star-empty.svg');
}
}, 'json');
return false;
diff --git a/module/my/view/doc.html.php b/module/my/view/doc.html.php
index 94feca1fdc..e45c44f210 100644
--- a/module/my/view/doc.html.php
+++ b/module/my/view/doc.html.php
@@ -55,7 +55,7 @@
- collector, ',' . $this->app->user->account . ',') !== false ? 'icon-star text-yellow' : 'icon-star-empty';?>
+ collector, ',' . $this->app->user->account . ',') !== false ? 'star' : 'star-empty';?>
collector, ',' . $this->app->user->account . ',') !== false ? $lang->doc->cancelCollection : $lang->doc->collect;?>
| id;?> |
@@ -80,7 +80,7 @@
- id&objectType=doc");?>" title="" class='btn btn-link ajaxCollect'>
+ id&objectType=doc");?>" title="" class='btn btn-link ajaxCollect'>
id&comment=false&from={$lang->navGroup->doc}", "", '', "title='{$lang->edit}' class='btn btn-link' data-app='doc'", true, false)?>
id&confirm=no&from={$lang->navGroup->doc}", "", 'hiddenwin', "title='{$lang->delete}' class='btn btn-link'")?>
diff --git a/module/project/view/createguide.html.php b/module/project/view/createguide.html.php
index af2ca0be3b..cfe8e50caf 100644
--- a/module/project/view/createguide.html.php
+++ b/module/project/view/createguide.html.php
@@ -20,6 +20,7 @@
#guideDialog .project-type.active img {border-color: #006AF1; border-width: 2px; margin-top: 0}
#guideDialog .col:nth-child(-n+3) {margin-bottom: 15px;}
@media screen and (max-width: 1366px){#guideDialog {width: 640px} #guideDialog .project-type-img.more-type {height: 108px;}}
+ @media screen and (max-width: 1366px){[lang^='en'] #guideDialog .row .col-xs-4 {height: 200px;} [lang^='de'] #guideDialog .row .col-xs-4 {height: 200px;} [lang^='fr'] #guideDialog .row .col-xs-4 {height: 200px;}}
diff --git a/module/repo/js/diff.js b/module/repo/js/diff.js
index 69df534fe1..dce31d6709 100644
--- a/module/repo/js/diff.js
+++ b/module/repo/js/diff.js
@@ -84,7 +84,7 @@ function getDiffs(fileName)
function createTab(filename, filepath)
{
$('[data-path="' + decodeURIComponent(filepath) + '"]').closest('li').addClass('selected');
- var tabID = Base64.encode(filepath).replaceAll('=', '-');
+ var tabID = Base64.encode(filepath).replace(/=/g, '-');
return {
id: tabID,
url: createLink('repo', 'ajaxGetDiffEditorContent', urlParams.replace('%s', Base64.encode(encodeURIComponent(filepath)))),
@@ -141,7 +141,7 @@ $(document).ready(function()
/* Remove file path for opened files. */
$('#fileTabs').on('onClose', function(event, tab) {
- var filepath = decodeURIComponent(Base64.decode(tab.id.replaceAll('-', '=')));
+ var filepath = decodeURIComponent(Base64.decode(tab.id.replace(/-/g, '=')));
var index = openedFiles.indexOf(filepath);
if(index > -1)
{
@@ -154,7 +154,7 @@ $(document).ready(function()
/* Append file path into the title. */
$('#fileTabs').on('onLoad', function(event, tab) {
- var filepath = decodeURIComponent(Base64.decode(tab.id.replaceAll('-', '=')));
+ var filepath = decodeURIComponent(Base64.decode(tab.id.replace(/-/g, '=')));
$('#tab-nav-item-' + tab.id).attr('title', filepath);
document.getElementById('tab-iframe-' + tab.id).contentWindow.updateEditorInline(diffAppose);
@@ -162,7 +162,7 @@ $(document).ready(function()
});
$('#fileTabs').on('onOpen', function(event, tab) {
- var filepath = decodeURIComponent(Base64.decode(tab.id.replaceAll('-', '=')));
+ var filepath = decodeURIComponent(Base64.decode(tab.id.replace(/-/g, '=')));
var index = openedFiles.indexOf(filepath);
if(index > -1) document.getElementById('tab-iframe-' + tab.id).contentWindow.updateEditorInline(diffAppose);
});
diff --git a/module/repo/js/monaco.js b/module/repo/js/monaco.js
index 16015dc2aa..9f0a7971f9 100644
--- a/module/repo/js/monaco.js
+++ b/module/repo/js/monaco.js
@@ -10,7 +10,7 @@ function createTab(filename, filepath)
{
$('[data-path="' + decodeURIComponent(filepath) + '"]').closest('li').addClass('selected');
/* encode twice for resolving chinese character. */
- var tabID = Base64.encode(Base64.encode(filepath).replaceAll('=', '-')).replaceAll('=', '-');
+ var tabID = Base64.encode(Base64.encode(filepath).replace(/=/g, '-')).replace(/=/g, '-');
return {
id: tabID,
url: createLink('repo', 'ajaxGetEditorContent', urlParams.replace('%s', Base64.encode(encodeURIComponent(filepath)))),
@@ -58,7 +58,7 @@ $(function()
/* Remove file path for opened files. */
$('#fileTabs').on('onClose', function(event, tab) {
/* encode twice for resolving chinese character. */
- var filepath = decodeURIComponent(Base64.decode(Base64.decode(tab.id.replaceAll('-', '=')).replaceAll('-', '=')));
+ var filepath = decodeURIComponent(Base64.decode(Base64.decode(tab.id.replace(/-/g, '=')).replace(/-/g, '=')));
var index = openedFiles.indexOf(filepath);
if(index > -1)
{
@@ -71,7 +71,7 @@ $(function()
/* Append file path into the title. */
$('#fileTabs').on('onLoad', function(event, tab) {
- var filepath = Base64.decode(tab.id.replaceAll('-', '='));
+ var filepath = Base64.decode(tab.id.replace(/-/g, '='));
$('#tab-nav-item-' + tab.id).attr('title', decodeURIComponent(filepath));
});
diff --git a/module/story/control.php b/module/story/control.php
index 6907447451..e5affc5b1c 100755
--- a/module/story/control.php
+++ b/module/story/control.php
@@ -1396,7 +1396,6 @@ class story extends control
if($tab == 'product' and !empty($product->shadow))
{
$backLink = $this->session->productList ? $this->session->productList : inlink('product', 'all');
- $viewLink = $this->createLink('story', 'view', "storyID=$storyID&version=$version¶m=$param&storyType=$storyType") . '#app=project';
$js = js::start();
$js .= "setTimeout(\"parent.$.apps.open('$uri#app=project')\", 100)";
$js .= js::end();
diff --git a/module/upgrade/model.php b/module/upgrade/model.php
index 21e5ecc31e..03afe0f3aa 100644
--- a/module/upgrade/model.php
+++ b/module/upgrade/model.php
@@ -8236,4 +8236,50 @@ class upgradeModel extends model
return true;
}
+
+ /**
+ * Change book to custom lib.
+ *
+ * @access public
+ * @return void
+ */
+ public function changeBookToCustomLib()
+ {
+ $libs = $this->dao->select('id,id')->from(TABLE_DOCLIB)->where('`type`')->eq('book')->fetchPairs();
+ foreach($libs as $libID)
+ {
+ $chapterModulePairs = array();
+ $chapters = $this->dao->select('*')->from(TABLE_DOC)->where('lib')->eq($libID)->andWhere('`type`')->eq('chapter')->orderBy('`grade` asc, `order` asc')->fetchGroup('grade', 'id');
+ foreach($chapters as $grade => $gradeChapters)
+ {
+ foreach($gradeChapters as $id => $chapter)
+ {
+ $module = new stdclass();
+ $module->root = $chapter->lib;
+ $module->name = $chapter->title;
+ $module->parent = zget($chapterModulePairs, $chapter->parent);
+ $module->grade = $chapter->grade;
+ $module->order = $chapter->order;
+ $module->type = 'doc';
+ $module->deleted = $chapter->deleted;
+
+ $this->dao->insert(TABLE_MODULE)->data($module)->exec();
+ $moduleID = $this->dao->lastInsertID();
+
+ $chapterModulePairs[$id] = $moduleID;
+
+ $path = explode(',', $chapter->path);
+ $path = array_filter($path);
+ foreach($path as $index => $chapterID) $path[$index] = zget($chapterModulePairs, $chapterID);
+ $path = implode(',', $path);
+ $this->dao->update(TABLE_MODULE)->set('`path`')->eq(",{$path},")->where('id')->eq($moduleID)->exec();
+
+ $this->dao->update(TABLE_DOC)->set('`module`')->eq($moduleID)->set('`parent`')->eq($moduleID)->set("`path` = REPLACE(`path`, '{$chapter->path}', ',{$path},')")->set('`type`')->eq('text')->where('`parent`')->eq($id)->andWhere('`type`')->eq('article')->exec();
+ }
+ }
+ $this->dao->update(TABLE_DOCLIB)->set('`type`')->eq('custom')->where('id')->eq($libID)->exec();
+ $this->dao->update(TABLE_DOC)->set('`type`')->eq('text')->where('`lib`')->eq($libID)->andWhere('grade')->eq(1)->andWhere('`type`')->eq('article')->exec();
+ }
+ return true;
+ }
}
diff --git a/www/static/svg/star-empty.svg b/www/static/svg/star-empty.svg
new file mode 100644
index 0000000000..f511fc22a4
--- /dev/null
+++ b/www/static/svg/star-empty.svg
@@ -0,0 +1,3 @@
+
diff --git a/www/static/svg/star.svg b/www/static/svg/star.svg
new file mode 100644
index 0000000000..b62ad8d972
--- /dev/null
+++ b/www/static/svg/star.svg
@@ -0,0 +1,4 @@
+
| |