diff --git a/frontend/module/cne/model.php b/frontend/module/cne/model.php
index 875d516d..79c8fd48 100644
--- a/frontend/module/cne/model.php
+++ b/frontend/module/cne/model.php
@@ -67,19 +67,59 @@ public function searchApps($keyword = '', $categories = array(), $page = 1, $pag
/**
* Get app info from cloud market.
*
- * @param int $id
+ * @param int $id
+ * @param boolean $analysis true: log this request for analysis.
+ * @param string $name
+ * @param string $version
+ * @param string $channel
* @access public
* @return object|null
*/
- public function getAppInfo($id)
+ public function getAppInfo($id, $analysis = false, $name = '', $version ='', $channel = '')
{
+ $apiParams = array();
+ $apiParams['analysis'] = $analysis ? 'true' : 'false' ;
+
+ if($id) $apiParams['id'] = $id;
+ if($name) $apiParams['name'] = $name;
+ if($version) $apiParams['version'] = $version;
+ if($channel) $apiParams['channel'] = $channel;
+
$apiUrl = '/api/market/appinfo';
- $result = $this->apiGet($apiUrl, array('id' => $id), $this->config->cloud->api->headers, $this->config->cloud->api->host);
+ $result = $this->apiGet($apiUrl, $apiParams, $this->config->cloud->api->headers, $this->config->cloud->api->host);
if(!isset($result->code) || $result->code != 200) return null;
return $result->data;
}
+ /**
+ * Get app version list to install.
+ *
+ * @param int $id
+ * @param string $name
+ * @param string $channel
+ * @param int $page
+ * @param int $pageSize
+ * @access public
+ * @return mixed
+ */
+ public function appVersionList($id, $name = '', $channel = '', $page = 1, $pageSize = 3)
+ {
+ $apiParams = array();
+ $apiParams['page'] = $page;
+ $apiParams['page_size'] = $pageSize;
+
+ if($id) $apiParams['id'] = $id;
+ if($name) $apiParams['name'] = $name;
+ if($channel) $apiParams['channel'] = $channel;
+
+ $apiUrl = '/api/market/app/version';
+ $result = $this->apiGet($apiUrl, $apiParams, $this->config->cloud->api->headers, $this->config->cloud->api->host);
+ if(!isset($result->code) || $result->code != 200) return null;
+
+ return array_combine(array_column($result->data, 'version'), $result->data);
+ }
+
/**
* Get upgradable versions of app from cloud market.
*
@@ -214,6 +254,38 @@ public function getCategories()
return $categories;
}
+ /**
+ * Get all instance of app in cluster.
+ *
+ * @access public
+ * @return array
+ */
+ public function instanceList()
+ {
+ $apiUrl = "/api/cne/system/app-full-list";
+ $result = $this->apiGet($apiUrl, array(), $this->config->CNE->api->headers);
+ if(empty($result) || $result->code != 200 || empty($result->data)) return array();
+
+ $instanceList = $result->data;
+ return array_combine(array_column($instanceList, 'name'), $instanceList);
+ }
+
+ /**
+ * Upgrade platform.
+ *
+ * @param string $toVersion
+ * @access public
+ * @return bool
+ */
+ public function upgradePlatform($toVersion)
+ {
+ $apiUrl = "/api/cne/system/update";
+ $result = $this->apiPost($apiUrl, array('version' => $toVersion, 'channel' => $this->config->CNE->api->channel), $this->config->CNE->api->headers);
+ if($result && $result->code == 200) return true;
+
+ return false;
+ }
+
/**
* Upgrade or degrade platform version.
*
@@ -645,6 +717,54 @@ public function queryStatus($instance)
return $result;
}
+ /**
+ * Get all database list of app.
+ *
+ * @param object $instance
+ * @access public
+ * @return mixed
+ */
+ public function appDBList($instance)
+ {
+ $apiUrl = "/api/cne/app/dbs";
+ $apiParams = array();
+ $apiParams['cluster'] = 'default';
+ $apiParams['name'] = $instance->k8name;
+ $apiParams['namespace'] = $instance->spaceData->k8space;
+ $apiParams['channel'] = $this->config->CNE->api->channel;
+
+ $result = $this->apiGet($apiUrl, $apiParams, $this->config->CNE->api->headers);
+ if(empty($result) || $result->code != 200 || empty($result->data)) return array();
+
+ $dbList = $result->data;
+ return array_combine(array_column($dbList, 'name'), $dbList);
+ }
+
+ /**
+ * Get detail of app database.
+ *
+ * @param object $instance
+ * @param string $dbName
+ * @access public
+ * @return null|object
+ */
+ public function appDBDetail($instance, $dbName)
+ {
+ $apiParams = array();
+ $apiParams['cluster'] = 'default';
+ $apiParams['name'] = $instance->k8name;
+ $apiParams['namespace'] = $instance->spaceData->k8space;
+ $apiParams['db'] = $dbName;
+ $apiParams['channel'] = $this->config->CNE->api->channel;
+
+ $apiUrl = "/api/cne/app/dbs/detail";
+
+ $result = $this->apiGet($apiUrl, $apiParams, $this->config->CNE->api->headers);
+ if(empty($result) || $result->code != 200 || empty($result->data)) return;
+
+ return $result->data;
+ }
+
/**
* Get database detail.
*
diff --git a/frontend/module/instance/config.php b/frontend/module/instance/config.php
index 585ddfd5..de11b3cb 100644
--- a/frontend/module/instance/config.php
+++ b/frontend/module/instance/config.php
@@ -2,3 +2,4 @@
$config->instance = new stdclass;
$config->instance->keepDomainList = array();
$config->instance->keepDomainList['console'] = 'console';
+$config->instance->keepDomainList['demo'] = 'demo';
diff --git a/frontend/module/instance/control.php b/frontend/module/instance/control.php
index d7136910..91e0ea35 100644
--- a/frontend/module/instance/control.php
+++ b/frontend/module/instance/control.php
@@ -54,6 +54,9 @@ public function view($id, $recTotal = 0, $recPerPage = 20, $pageID = 1, $tab ='b
$backupList = array();
if($tab == 'backup') $backupList = $this->instance->backupList($instance);
+ $dbList = new stdclass;
+ if($tab == 'advance') $dbList = $this->cne->appDBList($instance);
+
$this->view->position[] = $instance->appName;
$this->view->title = $instance->appName;
@@ -62,6 +65,7 @@ public function view($id, $recTotal = 0, $recPerPage = 20, $pageID = 1, $tab ='b
$this->view->defaultAccount = $this->cne->getDefaultAccount($instance);
$this->view->instanceMetric = $instanceMetric;
$this->view->backupList = $backupList;
+ $this->view->dbList = $dbList;
$this->view->tab = $tab;
$this->view->pager = $pager;
@@ -205,16 +209,20 @@ public function install($appID)
return $this->display('instance','resourceerror');
}
- $dbList = $this->cne->sharedDBList();
- $customData = new stdclass;
+ $versionList = $this->cne->appVersionList($cloudApp->id);
+ $dbList = $this->cne->sharedDBList();
+ $customData = new stdclass;
if(!empty($_POST))
{
$customData = fixer::input('post')
->trim('customName')->setDefault('customName', '')
->trim('customDomain')->setDefault('customDomain', null)
+ ->trim('version')->setDefault('version', '')
->trim('dbType')
->trim('dbService')
+ ->setDefault('app_version', '')
->get();
+ if($customData->version && isset($versionList[$customData->version])) $customData->app_version = $versionList[$customData->version]->app_version;
if(isset($this->config->instance->keepDomainList[$customData->customDomain]) || $this->instance->domainExists($customData->customDomain)) return $this->send(array('result' => 'fail', 'message' => $customData->customDomain . $this->lang->instance->errors->domainExists));
@@ -233,6 +241,8 @@ public function install($appID)
$this->view->title = $this->lang->instance->install . $cloudApp->alias;
$this->view->cloudApp = $cloudApp;
+
+ $this->view->versionList = array_combine(array_column($versionList, 'version'), array_column($versionList, 'app_version'));
$this->view->thirdDomain = $this->instance->randThirdDomain();
$this->view->dbList = $this->instance->dbListToOptions($dbList);
@@ -377,7 +387,9 @@ public function ajaxRestore()
if(empty($postData->instanceID) || empty($postData->backupName)) return $this->send(array('result' => 'fail', 'message' => $this->lang->instance->wrongRequestData));
$instance = $this->instance->getByID($postData->instanceID);
+ if(empty($instance))return print(js::alert($this->lang->instance->instanceNotExists) . js::locate($this->createLink('space', 'browse')));
+ $this->instance->backup($instance, $this->app->user); // Backup automatically before restroe.
$success = $this->instance->restore($instance, $this->app->user, $postData->backupName);
if(!$success)
{
@@ -403,4 +415,34 @@ public function ajaxDeleteBackup($backupID)
return $this->send(array('result' => 'success', 'message' => zget($this->lang->instance->notices, 'deleteSuccess')));
}
+
+ /**
+ * Generate database auth parameters and jump to login page.
+ *
+ * @access public
+ * @return void
+ */
+ public function ajaxDBAuthUrl()
+ {
+ $post = fixer::input('post')
+ ->setDefault('namespace', 'default')
+ ->setDefault('id', 0)
+ ->get();
+ if(empty($post->dbName)) return $this->send(array('result' => 'fail', 'message' => $this->lang->instance->errors->dbNameIsEmpty));
+
+ $instance = $this->instance->getByID($post->id);
+ if(empty($instance)) return $this->send(array('result' => 'fail', 'message' => $this->lang->instance->instanceNotExists));
+
+ $detail = $this->loadModel('cne')->appDBDetail($instance, $post->dbName);
+ if(empty($detail)) return $this->send(array('result' => 'fail', 'message' => $this->lang->instance->errors->notFoundDB));
+
+ $dbAuth = array();
+ $dbAuth['server'] = $detail->host . ':' . $detail->port;
+ $dbAuth['username'] = $detail->username;
+ $dbAuth['db'] = $detail->database;
+ $dbAuth['password'] = $detail->password;
+
+ $url = '/adminer?' . http_build_query($dbAuth);
+ $this->send(array('result' => 'success', 'message' => '', 'data' => array('url' => $url)));
+ }
}
diff --git a/frontend/module/instance/css/view.css b/frontend/module/instance/css/view.css
index f162268c..e0ba0d9f 100644
--- a/frontend/module/instance/css/view.css
+++ b/frontend/module/instance/css/view.css
@@ -15,6 +15,9 @@
#backup .panel {padding: 10px;}
#backup .panel .btn-toolbar{padding: 0 0 10px 0;}
-#backup table th.actions{padding-left: 15px;}
+#backup table th.actions {padding-left: 15px;}
#backup table td>.btn {padding-left: 5px; padding-right: 5px;}
-#backup .btn.btn-info[disabled] { color: rgba(255,255,255,.7); background-color: #61be68;}
+#backup .btn.btn-info[disabled] {color: rgba(255,255,255,.7); background-color: #61be68;}
+
+#advance .panel-title span {padding-left: 10px;}
+#advance hr {margin: 5px 20px;}
diff --git a/frontend/module/instance/js/view.js b/frontend/module/instance/js/view.js
index 00f28b22..3c7da2d5 100644
--- a/frontend/module/instance/js/view.js
+++ b/frontend/module/instance/js/view.js
@@ -220,6 +220,25 @@ $(function()
});
});
+ $('button.db-login').on('click', function(event)
+ {
+ let dbName = $(event.target).data('db-name');
+ let id = $(event.target).data('id');
+
+ $.post(createLink('instance', 'ajaxDBAuthUrl'), {dbName, id}).done(function(res)
+ {
+ let response = JSON.parse(res);
+ if(response.result == 'success')
+ {
+ window.parent.open(response.data.url, 'Adminer');
+ }
+ else
+ {
+ bootbox.alert(response.message);
+ }
+ });
+ });
+
var enableTimer = true;
window.parent.$(window.parent.document).on('showapp', function(event, app)
{
diff --git a/frontend/module/instance/lang/zh-cn.php b/frontend/module/instance/lang/zh-cn.php
index 6d3f9dbc..a41bb203 100644
--- a/frontend/module/instance/lang/zh-cn.php
+++ b/frontend/module/instance/lang/zh-cn.php
@@ -9,9 +9,10 @@
$lang->instance->space = '空间';
$lang->instance->domain = '域名';
$lang->instance->dbType = '数据库';
-$lang->instance->advantageOption = '高级选项';
+$lang->instance->advanceOption = '高级选项';
$lang->instance->baseInfo = '基本信息';
$lang->instance->backupAndRestore = '备份';
+$lang->instance->advance = '高级';
$lang->instance->serviceInfo = '服务信息';
$lang->instance->appTemplate = '应用模板';
@@ -58,10 +59,11 @@
$lang->instance->backup->volSize = '大小';
$lang->instance->backup->statusList = array();
-$lang->instance->backup->statusList['success'] = '失败';
+$lang->instance->backup->statusList['success'] = '成功';
$lang->instance->backup->statusList['failed'] = '失败';
$lang->instance->backup->statusList['pending'] = '等待备份';
$lang->instance->backup->statusList['processing'] = '备份中';
+$lang->instance->backup->statusList['inprogress'] = '备份中';
$lang->instance->backup->statusList['completed'] = '完成备份';
$lang->instance->backup->statusList['executedFailed'] = '备份失败';
$lang->instance->backup->statusList['uploading'] = '上传中';
@@ -71,7 +73,7 @@
$lang->instance->restore = new stdclass;
$lang->instance->restore->statusList = array();
-$lang->instance->restore->statusList['success'] = '失败';
+$lang->instance->restore->statusList['success'] = '成功';
$lang->instance->restore->statusList['failed'] = '失败';
$lang->instance->restore->statusList['pending'] = '等待回滚';
$lang->instance->restore->statusList['processing'] = '回滚中';
@@ -80,6 +82,15 @@
$lang->instance->restore->statusList['downloading'] = '下载中';
$lang->instance->restore->statusList['downloadFailed'] = '下载失败';
+$lang->instance->dbList = '数据库';
+$lang->instance->dbName = '名称';
+$lang->instance->dbStatus = '状态';
+$lang->instance->dbType = '类型';
+$lang->instance->action = '操作';
+$lang->instance->management = '管理';
+$lang->instance->dbReady = '正常';
+$lang->instance->dbWaiting = '等待就绪';
+
$lang->instance->log = new stdclass;
$lang->instance->log->date = '日期';
$lang->instance->log->message = '内容';
@@ -202,3 +213,6 @@
$lang->instance->errors->restoreRunning = '当前回滚正在进行中，请等待当前回滚完成。';
$lang->instance->errors->noBackup = '无备份数据，';
$lang->instance->errors->wrongRequestData = '提交的数据有误，请刷新页面后重试。';
+$lang->instance->errors->noDBList = '无数据库或不可访问';
+$lang->instance->errors->notFoundDB = '找不到该数据库';
+$lang->instance->errors->dbNameIsEmpty = '数据库名为空';
diff --git a/frontend/module/instance/model.php b/frontend/module/instance/model.php
index 9d73a931..f4f70177 100644
--- a/frontend/module/instance/model.php
+++ b/frontend/module/instance/model.php
@@ -64,7 +64,7 @@ public function getByIdList($idList)
* @access public
* @return array
*/
- public function getByAccount($account = '', $pager = null, $pinned = '', $searchParam = '')
+ public function getByAccount($account = '', $pager = null, $pinned = '', $searchParam = '', $status = 'all')
{
$instances = $this->dao->select('instance.*')->from(TABLE_INSTANCE)->alias('instance')
->leftJoin(TABLE_SPACE)->alias('space')->on('space.id=instance.space')
@@ -72,6 +72,7 @@ public function getByAccount($account = '', $pager = null, $pinned = '', $search
->beginIF($account)->andWhere('space.owner')->eq($account)->fi()
->beginIF($pinned)->andWhere('instance.pinned')->eq((int)$pinned)->fi()
->beginIF($searchParam)->andWhere('instance.name')->like("%{$searchParam}%")->fi()
+ ->beginIF($status != 'all')->andWhere('instance.status')->eq($status)->fi()
->orderBy('instance.id desc')
->beginIF($pager)->page($pager)->fi()
->fetchAll('id');
@@ -340,8 +341,8 @@ public function install($app, $dbList, $customData, $spaceID = null)
$instanceData->source = 'cloud';
$instanceData->channel = $this->app->session->cloudChannel ? $this->app->session->cloudChannel : $this->config->cloud->api->channel;
$instanceData->chart = $app->chart;
- $instanceData->appVersion = $app->app_version;
- $instanceData->version = $app->version;
+ $instanceData->appVersion = $customData->app_version ? $customData->app_version : $app->app_version;
+ $instanceData->version = $customData->version;
$instanceData->space = $space->id;
$instanceData->k8name = $k8name;
$instanceData->status = 'creating';
@@ -357,6 +358,7 @@ public function install($app, $dbList, $customData, $spaceID = null)
$apiParams->namespace = $space->k8space;
$apiParams->name = $k8name;
$apiParams->chart = $app->chart;
+ $apiParams->version = $instance->version;
$apiParams->channel = $instance->channel;
$apiParams->settings_map = $this->installationSettingsMap($customData, $dbList, $app, $instance);
@@ -441,7 +443,7 @@ public function stop($instance)
}
/**
- * Upgrade app instnace to higher version.
+ * Upgrade app instance to higher version.
*
* @param object $instance
* @param string $toVersion
@@ -596,25 +598,77 @@ public function dbListToOptions($databases)
}
/**
- * Delete instances don't exist in CNE.
+ * Restore instance by data from k8s cluster.
*
* @access public
* @return void
*/
- public function deleteNotExist()
+ public function restoreInstanceList()
{
- $instances = $this->dao->select('*')->from(TABLE_INSTANCE)->where('deleted')->eq(0)->fetchAll('id');
+ $k8AppList = $this->cne->instancelist();
+ $k8NameList = array_keys($k8AppList);
- $spaces = $this->dao->select('*')->from(TABLE_SPACE)->where('id')->in(array_column($instances, 'space'))->fetchAll('id');
-
- foreach($instances as $instance)
+ //软删除不存在的数据
+ $this->dao->update(TABLE_INSTANCE)->set('deleted')->eq(1)->where('k8name')->notIn($k8NameList)->exec();
+ foreach($k8AppList as $k8App)
{
- $instance->spaceData = zget($spaces, $instance->space, new stdclass);
+ $existInstance = $this->dao->select('id')->from(TABLE_INSTANCE)->where('k8name')->eq($k8App->name)->fetch();
+ if($existInstance) continue;
+
+ $marketApp = $this->cne->getAppInfo(0, false, $k8App->chart, $k8App->version, $k8App->channel);
+ if(empty($marketApp)) continue;
+
+ $instanceData = new stdclass;
+ $instanceData->appId = $marketApp->id;
+ $instanceData->appName = $marketApp->alias;
+ $instanceData->name = $marketApp->alias;
+ $instanceData->logo = $marketApp->logo;
+ $instanceData->desc = $marketApp->desc;
+ $instanceData->introduction = isset($marketApp->introduction) ? $marketApp->introduction : $marketApp->desc;
+ $instanceData->source = 'cloud';
+ $instanceData->channel = $k8App->channel;
+ $instanceData->chart = $k8App->chart;
+ $instanceData->appVersion = $marketApp->app_version;
+ $instanceData->version = $k8App->version;
+ $instanceData->k8name = $k8App->name;
+ $instanceData->status = 'stopped';
+
+ $parsedK8Name = $this->parseK8Name($k8App->name);
+
+ $instanceData->createdBy = $k8App->username ? $k8App->username : $parsedK8Name->createdBy;
+ $instanceData->createdAt = $parsedK8Name->createdAt;
+
+ $space = $this->dao->select('id,k8space')->from(TABLE_SPACE)->where('k8space')->eq($k8App->namespace)->fetch();
+ if(empty($space)) $space = $this->loadModel('space')->defaultSpace($instanceData->createdBy);
+
+ $instanceData->space = $space ? $space->id : $defaultSpace->id;
+
+ $this->dao->insert(TABLE_INSTANCE)->data($instanceData)->exec();
+ }
+ }
+
+ /**
+ * Parse K8Name to get more data: chart, created time, user name.
+ *
+ * @param string $k8Name
+ * @access public
+ * @return mixed
+ */
+ public function parseK8Name($k8Name)
+ {
+ $datePosition = strripos($k8Name, '-');
+ $createdAt = trim(substr($k8Name, $datePosition), '-');
- $statusResponse = $this->cne->queryStatus($instance);
+ $createdBy = trim(substr($k8Name, 0, $datePosition), '-');
+ $accountPosition = strripos($createdBy, '-');
+ $createdBy = trim(substr($createdBy, $accountPosition), '-');
- if($statusResponse->code == 404) $this->softDeleteByID($instance->id);
- }
+ $parsedData = new stdclass;
+ $parsedData->chart = trim(substr($k8Name, 0, $accountPosition));
+ $parsedData->createdBy = trim($createdBy, '-');
+ $parsedData->createdAt = date('Y-m-d H:i:s', strtotime($createdAt));
+
+ return $parsedData;
}
/**
@@ -767,6 +821,22 @@ public function printRestoreBtn($instance, $backup)
echo $btn;
}
+ /**
+ * Print button for managing database.
+ *
+ * @param object $db
+ * @param object $instance
+ * @access public
+ * @return void
+ */
+ public function printDBAction($db, $instance)
+ {
+ $disabled = $db->ready ? '' : 'disabled';
+ $btnHtml = html::commonButton($this->lang->instance->management, "{$disabled} data-db-name='{$db->name}' data-id='{$instance->id}'", 'db-login btn btn-primary');
+
+ echo $btnHtml;
+ }
+
/**
* Print message of action log of instance.
*
diff --git a/frontend/module/instance/view/advance.html.php b/frontend/module/instance/view/advance.html.php
new file mode 100644
index 00000000..c372f27a
--- /dev/null
+++ b/frontend/module/instance/view/advance.html.php
@@ -0,0 +1,34 @@
+
+
+
instance->domain;?>:domain;?>
+
+
+
+
+
+
+
+
+ | instance->dbName?> |
+ instance->dbType;?> |
+ instance->dbStatus;?> |
+ instance->action?> |
+
+
+
+
+
+ | db_name;?> |
+ db_type?> |
+ ready ? $lang->instance->dbReady : $lang->instance->dbWaiting;?> |
+ instance->printDBAction($db, $instance);?> |
+
+
+
+
+
+
+
+
diff --git a/frontend/module/instance/view/backup.html.php b/frontend/module/instance/view/backup.html.php
index e9ba1ec2..771a4427 100644
--- a/frontend/module/instance/view/backup.html.php
+++ b/frontend/module/instance/view/backup.html.php
@@ -34,16 +34,16 @@
| create_time);?> |
username;?> |
- backup_details->db[0], 'db_type');?> |
- backup_details->db[0], 'db_name');?> |
- instance->backup->statusList, strtolower(zget($backup->backup_details->db[0], 'status')));?> |
- backup_details->db[0], 'cost');?> |
- backup_details->db[0], 'size') / 1024);?> |
- backup_details->volume[0], 'pvc_name');?> |
- backup_details->volume[0], 'volume');?> |
- instance->backup->statusList, strtolower(zget($backup->backup_details->volume[0], 'status')));?> |
- backup_details->volume[0], 'cost');?> |
- backup_details->volume[0], 'doneBytes') / 1024);?> |
+ backup_details->db[0]) ? zget($backup->backup_details->db[0], 'db_type') : '';?> |
+ backup_details->db[0]) ? zget($backup->backup_details->db[0], 'db_name') : '';?> |
+ backup_details->db[0]) ? zget($lang->instance->backup->statusList, strtolower(zget($backup->backup_details->db[0], 'status'))) : '';?> |
+ backup_details->db[0]) ? zget($backup->backup_details->db[0], 'cost') : '';?> |
+ backup_details->db[0]) ? helper::formatKB(zget($backup->backup_details->db[0], 'size') / 1024) : '';?> |
+ backup_details->volume[0]) ? zget($backup->backup_details->volume[0], 'pvc_name') : '';?> |
+ backup_details->volume[0]) ? zget($backup->backup_details->volume[0], 'volume') : '';?> |
+ backup_details->volume[0]) ? zget($lang->instance->backup->statusList, strtolower(zget($backup->backup_details->volume[0], 'status'))) : '';?> |
+ backup_details->volume[0]) ? zget($backup->backup_details->volume[0], 'cost') : '';?> |
+ backup_details->volume[0]) ? helper::formatKB(zget($backup->backup_details->volume[0], 'doneBytes') / 1024) : '';?> |
instance->printRestoreBtn($instance, $backup);?> |
diff --git a/frontend/module/instance/view/baseinfo.html.php b/frontend/module/instance/view/baseinfo.html.php
index 4a10a625..7296cc0b 100644
--- a/frontend/module/instance/view/baseinfo.html.php
+++ b/frontend/module/instance/view/baseinfo.html.php
@@ -1,7 +1,7 @@
-
instance->serviceInfo?>
+
instance->serviceInfo;?>
diff --git a/frontend/module/instance/view/install.html.php b/frontend/module/instance/view/install.html.php
index ae77f6d8..c0e6a027 100644
--- a/frontend/module/instance/view/install.html.php
+++ b/frontend/module/instance/view/install.html.php
@@ -21,8 +21,8 @@
- dependencies->mysql)):?>
-
instance->advantageOption . "", '', "data-toggle='collapse'");?>
+
instance->advanceOption . "", '', "data-toggle='collapse'");?>
-
instance->install);?>
diff --git a/frontend/module/instance/view/view.html.php b/frontend/module/instance/view/view.html.php
index 08d20e89..85611548 100644
--- a/frontend/module/instance/view/view.html.php
+++ b/frontend/module/instance/view/view.html.php
@@ -27,8 +27,9 @@
app->getModuleRoot() . '/common/view/footer.html.php';?>
diff --git a/frontend/module/navigation/control.php b/frontend/module/navigation/control.php
index 394aa130..7d633321 100644
--- a/frontend/module/navigation/control.php
+++ b/frontend/module/navigation/control.php
@@ -11,41 +11,138 @@
*/
class navigation extends control
{
+ /**
+ * Create a app.
+ *
+ * @access public
+ * @return void
+ */
+ public function create()
+ {
+ if($_POST)
+ {
+ $this->navigation->create();
+ if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
+ return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => inlink('browse')));
+ }
+
+ $this->display();
+ }
+
+ /**
+ * The main page of navigation.
+ *
+ * @access public
+ * @return void
+ */
public function browse()
{
$this->loadModel('instance');
$account = $this->app->user->account;
- $instances = $this->instance->getByAccount($account);
- $pinnedInstances = $this->instance->getByAccount($account, '', true);
+ $hideInaccessible = $this->navigation->getSetting('hideInaccessible');
+ $status = $hideInaccessible->value == 'on' ? 'running' : 'all';
+
+ $instances = $this->instance->getByAccount($account);
+ $pinnedInstances = $this->instance->getByAccount($account, '', true, '', $status);
+ $apps = $this->navigation->getApps();
+ $pinnedApps = $this->navigation->getApps(true);
$this->view->title = $this->lang->navigation->common;
$this->view->instances = $instances;
$this->view->pinnedInstances = $pinnedInstances;
+ $this->view->apps = $apps;
+ $this->view->pinnedApps = $pinnedApps;
$this->display();
}
- public function ajaxGetPinnedInstance($id)
+ /**
+ * Ajax get pinned instances and pinned apps.
+ *
+ * @param int $id
+ * @param string $objectType
+ * @access public
+ * @return void
+ */
+ public function ajaxGetPinnedInstance($id, $objectType = 'instance')
{
$this->loadModel('instance');
- $this->instance->pinToggle($id);
+ if($objectType == 'app')
+ {
+ $this->navigation->pinToggle($id);
+ }
+ else
+ {
+ $this->instance->pinToggle($id);
+ }
$account = $this->app->user->account;
- $this->view->pinnedInstances = $this->instance->getByAccount($account, '', true);
+ $hideInaccessible = $this->navigation->getSetting('hideInaccessible');
+ $status = $hideInaccessible->value == 'on' ? 'running' : 'all';
+
+ $this->view->pinnedInstances = $this->instance->getByAccount($account, '', true, '', $status);
+ $this->view->pinnedApps = $this->navigation->getApps(true);
$this->view->showAddItem = true;
$this->display();
}
+ /**
+ * Ajax search pinned instances and pinned apps.
+ *
+ * @param string $name
+ * @access public
+ * @return void
+ */
public function ajaxSearchPinnedInstance($name = '')
{
$name = base64_decode(trim($name));
$this->loadModel('instance');
$account = $this->app->user->account;
- $this->view->pinnedInstances = $this->instance->getByAccount($account, '', true, $name);
+
+ $hideInaccessible = $this->navigation->getSetting('hideInaccessible');
+ $status = $hideInaccessible->value == 'on' ? 'running' : 'all';
+
+ $this->view->pinnedInstances = $this->instance->getByAccount($account, '', true, $name, $status);
+ $this->view->pinnedApps = $this->navigation->getApps(true, $name);
$this->view->showAddItem = false;
$this->display('navigation', 'ajaxGetPinnedInstance');
}
+
+ /**
+ * The settings page of navigation.
+ *
+ * @access public
+ * @return void
+ */
+ public function settings()
+ {
+ $this->view->settings = $this->navigation->getSettings();
+ $this->display();
+ }
+
+ /**
+ * Configure settings for navigation.
+ *
+ * @param string $field
+ * @access public
+ * @return void
+ */
+ public function configure($field)
+ {
+ if($_POST)
+ {
+ $this->navigation->configure($field);
+ if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
+ return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => inlink('settings')));
+ }
+
+ $hideInaccessible = $this->navigation->getSetting('hideInaccessible');
+
+ $this->view->field = $field;
+ $this->view->value = $hideInaccessible->value;
+ $this->display();
+ }
}
diff --git a/frontend/module/navigation/css/browse.css b/frontend/module/navigation/css/browse.css
index d40c8286..7d347e8e 100644
--- a/frontend/module/navigation/css/browse.css
+++ b/frontend/module/navigation/css/browse.css
@@ -4,7 +4,7 @@
#app main {flex-direction: column;}
#app main, #app #sortable {padding: 30px 10px; display: flex; justify-content: center; align-items: center; flex: 1; position: relative; flex-wrap: wrap; align-content: center; list-style: none; margin: 0;}
#config-buttons {position: fixed; bottom: 0; right: 0; display: flex; flex-direction: column;}
-#config-buttons a {text-align: center; line-height: 50px; color: white; margin-top: 1px;}
+#config-buttons a {text-align: center; line-height: 30px; color: white; margin-top: 1px;}
.item-container {position: relative;}
#app.sidebar nav {left: 0;}
.add-item {width: 280px; height: 90px; margin: 20px; flex: 0 0 280px; border-radius: 6px; padding: 20px; border: 4px dashed rgba(255, 255, 255, 0.7); box-shadow: 0 0 20px 2px rgba(0, 0, 0, 0.3); color: white; overflow: hidden; position: relative; display: none; outline: 1px solid transparent;}
diff --git a/frontend/module/navigation/css/configure.css b/frontend/module/navigation/css/configure.css
new file mode 100644
index 00000000..cc34cef2
--- /dev/null
+++ b/frontend/module/navigation/css/configure.css
@@ -0,0 +1,41 @@
+article, aside, details, figcaption, figure, footer, header, hgroup, main, menu, nav, section, summary {display: block;}
+#app main {flex-direction: column;}
+#app {display: flex; min-height: 100vh; flex-direction: column; background-image: url("/background.jpg"); background-repeat: no-repeat; background-size: cover; background-position: bottom center;}
+#app main, #app #sortable {padding: 30px 10px; display: flex; justify-content: center; align-items: center; flex: 1; position: relative; flex-wrap: wrap; align-content: center; list-style: none; margin: 0;}
+#app .content {flex-grow: 1; display: flex; flex-direction: column;}
+.module-container {box-shadow: 0 0 10px 0px rgba(0, 0, 0, 0.4); border: 1px solid #cdced8; background: #f9fafd; max-width: 1000px; width: 100%; margin: 10px 40px; border-radius: 5px; overflow: hidden;}
+.module-container header, .module-container footer {display: flex; justify-content: space-between; align-items: center; border-top: 1px solid #fff; background: #f2f3f6; font-size: 16px; border-bottom: 1px solid #dbdce3; height: 60px; position: relative;}
+.module-container header .section-title, .module-container footer .section-title {font-size: 18px; color: #5b5b5b; margin-left: 25px;}
+.module-container footer {border-top: 1px solid #dbdce3;}
+.module-actions {display: flex; justify-content: space-between; align-items: center;}
+.module-actions .button {font-size: 18px; color: #515564; padding: 0 10px; border: none; border-left: 1px solid #cdced8; display: flex; line-height: 1; position: relative; background: transparent; flex-direction: column; justify-content: center; align-items: center; min-width: 65px; height: 60px; text-decoration: none; box-sizing: border-box;}
+.module-actions .button:after {position: absolute; content: ""; top: 0; left: 0; bottom: 0; border-right: 1px solid #fff;}
+.module-actions .button span {display: inline-block; line-height: 1; font-size: 9px; font-weight: 400; text-transform: uppercase; color: #ababab; position: relative; top: 4px; margin: 0;}
+.module-container footer {border-top: 1px solid #dbdce3;}
+.module-container .table {width: 100%; margin: 0; background: #fff;}
+.module-container .table tbody tr:hover {background: #fefbf2;}
+.module-container .table tbody tr:hover td:first-child {position: relative;}
+.module-container .table tbody tr:hover td:first-child:before {content: ""; position: absolute; top: 0; left: 0; bottom: 0; width: 5px; background: #0eb584;}
+.module-container .table tbody td {padding: 20px 25px; font-size: 13px; color: #2f313a; max-width: 500px; word-break: break-word;}
+.module-container .table tbody td.form-error {background: #e69191; color: white; text-align: center;}
+.module-container .table tbody a {color: #2f313a;}
+div.create {padding: 30px 15px; display: flex; flex-wrap: wrap;}
+div.create .input {width: 280px; margin: 20px;}
+div.create .input label:not(.switch) {width: 100%; font-size: 13px; color: #9094a5; margin-bottom: 15px; display: block; font-weight: 300;}
+div.create .input input, div.create .input select {width: 100%; border: 1px solid #dedfe2; padding: 10px; border-radius: 6px;}
+#config-buttons {position: fixed; bottom: 0; right: 0; display: flex; flex-direction: column;}
+#config-buttons a img {width: 26px; height: 26px; margin-top: 12px;}
+#config-buttons a {text-align: center; line-height: 30px; color: white; margin-top: 1px;}
+
+/* The slider */
+.switch input {display: none;}
+.config-slider {position: absolute; cursor: pointer; top: 0; left: 0; right: 0; bottom: 0; background-color: #4a556b; transition: 0.4s;}
+.config-slider:before {position: absolute; content: ""; height: 14px; width: 14px; left: 3px; bottom: 3px; background-color: white; transition: 0.4s;}
+input:checked + .config-slider {background-color: #2196F3;}
+input:focus + .config-slider {box-shadow: 0 0 1px #2196F3;}
+input:checked + .config-slider:before {transform: translateX(16px);}
+.switch {position: relative; display: inline-block; width: 36px; height: 20px;}
+
+/* Rounded sliders */
+.config-slider.round {border-radius: 20px;}
+.config-slider.round:before {border-radius: 50%;}
diff --git a/frontend/module/navigation/css/create.css b/frontend/module/navigation/css/create.css
new file mode 100644
index 00000000..0e4674a7
--- /dev/null
+++ b/frontend/module/navigation/css/create.css
@@ -0,0 +1,33 @@
+article, aside, details, figcaption, figure, footer, header, hgroup, main, menu, nav, section, summary {display: block;}
+#app main {flex-direction: column;}
+#app {display: flex; min-height: 100vh; flex-direction: column; background-image: url("/background.jpg"); background-repeat: no-repeat; background-size: cover; background-position: bottom center;}
+#app main, #app #sortable {padding: 30px 10px; display: flex; justify-content: center; align-items: center; flex: 1; position: relative; flex-wrap: wrap; align-content: center; list-style: none; margin: 0;}
+#app .content {flex-grow: 1; display: flex; flex-direction: column;}
+.module-container {box-shadow: 0 0 10px 0px rgba(0, 0, 0, 0.4); border: 1px solid #cdced8; background: #f9fafd; max-width: 1000px; width: 100%; margin: 10px 40px; border-radius: 5px; overflow: hidden;}
+.module-container header, .module-container footer {display: flex; justify-content: space-between; align-items: center; border-top: 1px solid #fff; background: #f2f3f6; font-size: 16px; border-bottom: 1px solid #dbdce3; height: 60px; position: relative;}
+.module-container header .section-title, .module-container footer .section-title {font-size: 18px; color: #5b5b5b; margin-left: 25px;}
+.module-container footer {border-top: 1px solid #dbdce3;}
+.module-actions {display: flex; justify-content: space-between; align-items: center;}
+.module-actions .button {font-size: 18px; color: #515564; padding: 0 10px; border: none; border-left: 1px solid #cdced8; display: flex; line-height: 1; position: relative; background: transparent; flex-direction: column; justify-content: center; align-items: center; min-width: 65px; height: 60px; text-decoration: none; box-sizing: border-box;}
+.module-actions .button:after {position: absolute; content: ""; top: 0; left: 0; bottom: 0; border-right: 1px solid #fff;}
+.module-actions .button span {display: inline-block; line-height: 1; font-size: 9px; font-weight: 400; text-transform: uppercase; color: #ababab; position: relative; top: 4px; margin: 0;}
+.module-container footer {border-top: 1px solid #dbdce3;}
+.module-container .table {width: 100%; margin: 0; background: #fff;}
+.module-container .table tbody tr:hover {background: #fefbf2;}
+.module-container .table tbody tr:hover td:first-child {position: relative;}
+.module-container .table tbody tr:hover td:first-child:before {content: ""; position: absolute; top: 0; left: 0; bottom: 0; width: 5px; background: #0eb584;}
+.module-container .table tbody td {padding: 20px 25px; font-size: 13px; color: #2f313a; max-width: 500px; word-break: break-word;}
+.module-container .table tbody td.form-error {background: #e69191; color: white; text-align: center;}
+.module-container .table tbody a {color: #2f313a;}
+div.create {padding: 30px 15px; display: flex; flex-wrap: wrap;}
+div.create .input {width: 280px; margin: 20px;}
+div.create .input label:not(.switch) {width: 100%; font-size: 13px; color: #9094a5; margin-bottom: 15px; display: block; font-weight: 300;}
+div.create .input input, div.create .input select {width: 100%; border: 1px solid #dedfe2; padding: 10px; border-radius: 6px;}
+
+.create .textarea {width: 100%; margin: 0px 20px;}
+.create .textarea textarea {width: 100%; border: 1px solid #dedfe2; padding: 15px; border-radius: 6px; height: 100px; font-size: 14px;}
+.create .textarea label:not(.switch) {width: 100%; font-size: 13px; color: #9094a5; margin-bottom: 15px; display: block; font-weight: 300;}
+
+#config-buttons {position: fixed; bottom: 0; right: 0; display: flex; flex-direction: column;}
+#config-buttons a img {width: 26px; height: 26px; margin-top: 12px;}
+#config-buttons a {text-align: center; line-height: 30px; color: white; margin-top: 1px;}
diff --git a/frontend/module/navigation/css/settings.css b/frontend/module/navigation/css/settings.css
new file mode 100644
index 00000000..811a06a3
--- /dev/null
+++ b/frontend/module/navigation/css/settings.css
@@ -0,0 +1,19 @@
+header, main, nav, section, summary {display: block;}
+#app {display: flex; min-height: 100vh; flex-direction: column; background-image: url("/background.jpg"); background-repeat: no-repeat; background-size: cover; background-position: bottom center;}
+#app .content {flex-grow: 1; display: flex; flex-direction: column;}
+#app main {flex-direction: column;}
+#app main, #app #sortable {padding: 30px 10px; display: flex; justify-content: center; align-items: center; flex: 1; position: relative; flex-wrap: wrap; align-content: center; list-style: none; margin: 0;}
+.module-container {box-shadow: 0 0 10px 0px rgba(0, 0, 0, 0.4); border: 1px solid #cdced8; background: #f9fafd; max-width: 1000px; width: 100%; margin: 10px 40px; border-radius: 5px; overflow: hidden;}
+
+#config-buttons {position: fixed; bottom: 0; right: 0; display: flex; flex-direction: column;}
+#config-buttons a {text-align: center; line-height: 30px; color: white; margin-top: 1px;}
+
+.module-container .table {width: 100%; margin: 0; background: #fff;}
+.module-container .table thead th {background: #f2f3f6; color: #767d94; border-top: 1px solid #fff; text-align: left; font-size: 13px; text-transform: uppercase; padding: 15px 25px;}
+.module-container .table tbody tr:hover {background: #fefbf2;}
+.module-container .table tbody tr:hover td:first-child {position: relative;}
+.module-container .table tbody tr:hover td:first-child:before {content: ""; position: absolute; top: 0; left: 0; bottom: 0; width: 5px; background: #0eb584;}
+.module-container .table tbody td {padding: 20px 25px; font-size: 13px; color: #2f313a; max-width: 500px; word-break: break-word;}
+.module-container .table tbody td.form-error {background: #e69191; color: white; text-align: center;}
+.module-container .table tbody a {color: #2f313a;}
+.module-container header .section-title, .module-container footer .section-title {font-size: 18px; color: #5b5b5b; margin-left: 25px;}
diff --git a/frontend/module/navigation/js/browse.js b/frontend/module/navigation/js/browse.js
index 677b62ec..4b47d76a 100644
--- a/frontend/module/navigation/js/browse.js
+++ b/frontend/module/navigation/js/browse.js
@@ -71,7 +71,14 @@ $('.instance-item').click(function()
$(this).addClass('active');
}
instanceID = $(this).attr('data-id');
- link = createLink('navigation', 'ajaxGetPinnedInstance', 'instanceID=' + instanceID);
+ if($(this).hasClass('app-item'))
+ {
+ link = createLink('navigation', 'ajaxGetPinnedInstance', 'instanceID=' + instanceID + '&objectType=app');
+ }
+ else
+ {
+ link = createLink('navigation', 'ajaxGetPinnedInstance', 'instanceID=' + instanceID);
+ }
$.get(link, function(result)
{
$('#sortable').replaceWith(result);
diff --git a/frontend/module/navigation/lang/zh-cn.php b/frontend/module/navigation/lang/zh-cn.php
index 054970d3..4396168d 100644
--- a/frontend/module/navigation/lang/zh-cn.php
+++ b/frontend/module/navigation/lang/zh-cn.php
@@ -1,5 +1,17 @@
navigation = new stdclass;
-$lang->navigation->common = '导航';
+$lang->navigation->common = '导航';
$lang->navigation->pinInstance = '固定服务到导航页';
-$lang->navigation->search = '搜索';
+$lang->navigation->search = '搜索';
+$lang->navigation->addApp = '添加服务';
+$lang->navigation->url = 'URL';
+$lang->navigation->appName = '服务名称';
+$lang->navigation->label = '设置项';
+$lang->navigation->value = '值';
+
+$lang->navigation->settings = new stdclass();
+$lang->navigation->settings->common = '设置';
+$lang->navigation->settings->hideInaccessible = '隐藏未启动的服务';
+$lang->navigation->settings->on = '开启';
+$lang->navigation->settings->off = '关闭';
+
diff --git a/frontend/module/navigation/model.php b/frontend/module/navigation/model.php
new file mode 100644
index 00000000..543be362
--- /dev/null
+++ b/frontend/module/navigation/model.php
@@ -0,0 +1,123 @@
+
+ * @package navigation
+ * @version $Id$
+ * @link https://www.qucheng.com
+ */
+class navigationModel extends model
+{
+ /**
+ * The construct of navigation model.
+ *
+ * @access public
+ * @return void
+ */
+ public function __construct()
+ {
+ parent::__construct();
+ }
+
+ /**
+ * Get a app by id.
+ *
+ * @param int $id
+ * @access public
+ * @return object
+ */
+ public function getByID($id)
+ {
+ return $this->dao->select('*')->from(TABLE_NAVINSTANCE)->where('id')->eq($id)->fetch();
+ }
+
+ /**
+ * Create a app.
+ *
+ * @access public
+ * @return void
+ */
+ public function create()
+ {
+ $app = fixer::input('post')
+ ->setDefault('pinned', 0)
+ ->setDefault('createdBy', $this->app->user->account)
+ ->setDefault('createdAt', helper::now())
+ ->get();
+
+ $this->dao->insert(TABLE_NAVINSTANCE)->data($app)->autoCheck()->check('title', 'notempty')->exec();
+ }
+
+ /**
+ * Get apps.
+ *
+ * @param string $pinned
+ * @param string $searchParam
+ * @access public
+ * @return array
+ */
+ public function getApps($pinned = '', $searchParam = '')
+ {
+ $apps = $this->dao->select('*')->from(TABLE_NAVINSTANCE)
+ ->beginIF($pinned)->where('pinned')->eq((int)$pinned)->fi()
+ ->beginIF($searchParam)->andWhere('title')->like("%{$searchParam}%")->fi()
+ ->fetchAll();
+ return $apps;
+ }
+
+ /**
+ * Toggle pinned or unpinned.
+ *
+ * @param int $appID
+ * @access public
+ * @return void
+ */
+ public function pinToggle($appID)
+ {
+ $app = $this->getByID($appID);
+ $pinned = $app->pinned == '0' ? '1' : '0';
+ $this->dao->update(TABLE_NAVINSTANCE)->set('pinned')->eq($pinned)->where('id')->eq($appID)->exec();
+ }
+
+ /**
+ * Get all navigation's setting.
+ *
+ * @access public
+ * @return array
+ */
+ public function getSettings()
+ {
+ $settings = $this->dao->select('*')->from(TABLE_CONFIG)->where('module')->eq('navigation')->fetchAll();
+ return $settings;
+ }
+
+ /**
+ * Get a setting of navigation.
+ *
+ * @param string $field
+ * @access public
+ * @return object
+ */
+ public function getSetting($field)
+ {
+ return $this->dao->select('value')->from(TABLE_CONFIG)->where('module')->eq('navigation')->andWhere('`key`')->eq($field)->fetch();
+ }
+
+ /**
+ * Change a setting.
+ *
+ * @param string $field
+ * @access public
+ * @return void
+ */
+ public function configure($field)
+ {
+ $post = fixer::input('post')->get();
+ $value = $post->value == '1' ? 'on' : 'off';
+
+ $this->loadModel('setting')->setItem('system.navigation.global.hideInaccessible', $value);
+ }
+}
diff --git a/frontend/module/navigation/view/ajaxgetpinnedinstance.html.php b/frontend/module/navigation/view/ajaxgetpinnedinstance.html.php
index 63edf863..10c0f0a6 100644
--- a/frontend/module/navigation/view/ajaxgetpinnedinstance.html.php
+++ b/frontend/module/navigation/view/ajaxgetpinnedinstance.html.php
@@ -4,8 +4,6 @@
#app .content {flex-grow: 1; display: flex; flex-direction: column;}
#app main {flex-direction: column;}
#app main, #app #sortable {padding: 30px 10px; display: flex; justify-content: center; align-items: center; flex: 1; position: relative; flex-wrap: wrap; align-content: center; list-style: none; margin: 0;}
-#config-buttons {position: fixed; bottom: 0; right: 0; display: flex; flex-direction: column;}
-#config-buttons a {text-align: center; line-height: 50px; color: white; margin-top: 1px;}
.item-container {position: relative;}
#app.sidebar nav {left: 0;}
.add-item {width: 280px; height: 90px; margin: 20px; flex: 0 0 280px; border-radius: 6px; padding: 20px; border: 4px dashed rgba(255, 255, 255, 0.7); box-shadow: 0 0 20px 2px rgba(0, 0, 0, 0.3); color: white; overflow: hidden; position: relative; display: none; outline: 1px solid transparent;}
@@ -52,6 +50,21 @@
+
+
+
+
+ logo) echo html::image($app->logo, "class='instance-logo'");?>
+
+
+
+
+
lang->navigation->pinInstance;?>
diff --git a/frontend/module/navigation/view/browse.html.php b/frontend/module/navigation/view/browse.html.php
index f5e84c64..fa8f8c84 100644
--- a/frontend/module/navigation/view/browse.html.php
+++ b/frontend/module/navigation/view/browse.html.php
@@ -1,6 +1,6 @@
pinned) == true ? 'active' : '';?>
name;?>
+
+ pinned) == true ? 'active' : '';?>
+ title;?>
+
@@ -47,6 +51,19 @@
+
+
+
+
+ logo) echo html::image($app->logo, "class='instance-logo'");?>
+
+
+
diff --git a/frontend/module/navigation/view/configure.html.php b/frontend/module/navigation/view/configure.html.php
new file mode 100644
index 00000000..e7910745
--- /dev/null
+++ b/frontend/module/navigation/view/configure.html.php
@@ -0,0 +1,47 @@
+
+ * @package navigation
+ * @version $Id$
+ * @link https://www.qucheng.com
+ */
+?>
+
+
+
+
+
+
+ createLink('navigation', 'browse'), '');?>
+ createLink('navigation', 'settings'), '');?>
+
+
+
+
+
diff --git a/frontend/module/navigation/view/create.html.php b/frontend/module/navigation/view/create.html.php
new file mode 100644
index 00000000..87fda27e
--- /dev/null
+++ b/frontend/module/navigation/view/create.html.php
@@ -0,0 +1,49 @@
+
+ * @package navigation
+ * @version $Id$
+ * @link https://www.qucheng.com
+ */
+?>
+
+
+
+
+
+
+ createLink('navigation', 'browse'), '');?>
+ createLink('navigation', 'settings'), '');?>
+
+
+
+
+
diff --git a/frontend/module/navigation/view/settings.html.php b/frontend/module/navigation/view/settings.html.php
new file mode 100644
index 00000000..e130631f
--- /dev/null
+++ b/frontend/module/navigation/view/settings.html.php
@@ -0,0 +1,47 @@
+
+ * @package navigation
+ * @version $Id$
+ * @link https://www.qucheng.com
+ */
+?>
+
+
+
+
+
+
+
+
+
+ | lang->navigation->label;?> |
+ lang->navigation->value;?> |
+ |
+
+
+
+
+
+ | lang->navigation->settings, $setting->key);?> |
+ lang->navigation->settings, $setting->value);?> |
+ createLink('navigation', 'configure', 'field=hideInaccessible'), "");?> |
+
+
+
+
+
+
+ createLink('navigation', 'browse'), '');?>
+ createLink('navigation', 'settings'), '');?>
+
+
+
+
+
diff --git a/frontend/module/space/control.php b/frontend/module/space/control.php
index 85f4da20..093b1870 100644
--- a/frontend/module/space/control.php
+++ b/frontend/module/space/control.php
@@ -23,7 +23,7 @@ class space extends control
@access public
* @return void
*/
- public function browse($spaceID = null, $browseType = 'all', $recTotal = 0, $recPerPage = 20, $pageID = 1)
+ public function browse($spaceID = null, $browseType = 'all', $recTotal = 0, $recPerPage = 24, $pageID = 1)
{
$this->app->loadLang('instance');
$this->loadModel('instance');
diff --git a/frontend/module/space/view/browsebycard.html.php b/frontend/module/space/view/browsebycard.html.php
index 96b26274..3179ae40 100644
--- a/frontend/module/space/view/browsebycard.html.php
+++ b/frontend/module/space/view/browsebycard.html.php
@@ -59,6 +59,6 @@