dever 4 éve
szülő
commit
27ba49c7d7
5 módosított fájl, 150 hozzáadás és 7 törlés
  1. 142 0
      assets/layadmin/html/doc/view.html
  2. 1 1
      database/api.php
  3. 2 2
      database/role.php
  4. 2 1
      src/Api.php
  5. 3 3
      src/Opt.php

+ 142 - 0
assets/layadmin/html/doc/view.html

@@ -0,0 +1,142 @@
+<!DOCTYPE html>
+<html lang="zh-CN">
+<head>
+<filter><script src="../script/lib/common.js"></script><script src="../script/lib/jquery/jquery.min.js"></script></filter>
+<meta charset="utf-8">
+<title>Doc by Dever</title>
+<meta name="keywords" content="" />
+<meta name="description" content="" /> 
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<link rel="stylesheet" type="text/css" href="../script/lib/bootstrap/css/bootstrap.min.css" />
+<link rel="stylesheet" type="text/css" href="../script/lib/doc/doc.min.css">
+<style>
+body,html
+{
+	background-color:white;
+}
+.bs-docs-container
+{
+	margin-bottom:40px;
+}
+.bs-docs-header
+{
+	margin-top: -20px;
+}
+</style>
+</head>
+
+<body>
+    <!-- Static navbar -->
+	<nav class="navbar navbar-default navbar-fixed-tops navbar-static-top dever-nav">
+	  <div class="container">
+		<div class="navbar-header">
+		  <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
+			<span class="sr-only">Toggle navigation</span>
+			<span class="icon-bar"></span>
+			<span class="icon-bar"></span>
+			<span class="icon-bar"></span>
+		  </button>
+		  <a class="navbar-brand" id="dever-logo" href="#">DeverDoc</a>
+		</div>
+		<div class="navbar-collapse collapse" id="navbar">
+		  <ul class="nav navbar-nav" id="dever_navbar">
+	  		<li class="active"><a href="#">社区</a></li>
+	  		<li><a href="#about">博客</a></li>
+	  		<li><a href="#contact">关于</a></li>
+	  		<li><a href="#about">文档</a></li>
+		  </ul>
+		  <div class="navbar-right">
+	        <form method="GET" action="" accept-charset="UTF-8" class="navbar-form navbar-left" target="_blank">
+	          <div class="form-group">
+				<input class="form-control search-input mac-style" placeholder="搜索" name="q" type="text">
+	          </div>
+	        </form>
+	      </div>
+		</div><!--/.nav-collapse -->
+	  </div>
+	</nav>
+
+    <div class="bs-docs-header" id="top" tabindex="-1">
+      <div class="container">
+        <h1>起步</h1>
+        <p>简要介绍 Bootstrap,以及如何下载、使用,还有基本模版和案例,等等。</p>
+      </div>
+    </div>
+
+    <div class="container bs-docs-container">
+    	<div class="row">
+        	<div class="col-md-9" role="main">
+        		<div class="bs-docs-section">
+					  <h1 id="disable-responsive" class="page-header"><a class="anchorjs-link " href="#disable-responsive" aria-label="Anchor link for: disable responsive" data-anchorjs-icon="" style="font-family: anchorjs-icons; font-style: normal; font-variant: normal; font-weight: normal; position: absolute; margin-left: -1em; padding-right: 0.5em;"></a><span>禁止响应式布局</span></h1>
+
+					  <div>
+						  <p class="lead">Bootstrap 会自动帮你针对不同的屏幕尺寸调整你的页面,使其在各个尺寸的屏幕上表现良好。下面我们列出了如何禁用这一特性,就像这个<a href="../examples/non-responsive/">非响应式布局实例</a>页面一样。</p>
+
+						  <h2 id=""><a class="anchorjs-link " href="#" aria-label="Anchor link for: " data-anchorjs-icon="" style="font-family: anchorjs-icons; font-style: normal; font-variant: normal; font-weight: normal; position: absolute; margin-left: -1em; padding-right: 0.5em;"></a>禁止响应式布局有如下几步:</h2>
+						  <ol>
+						    <li>移除 <a href="../css/#overview-mobile">此 CSS 文档</a>中提到的设置浏览器视口(viewport)的标签:<code>&lt;meta&gt;</code>。</li>
+						    <li>通过为 <code>.container</code> 类设置一个 <code>width</code> 值从而覆盖框架的默认 width 设置,例如 <code>width: 970px !important;</code> 。请确保这些设置全部放在默认的 Bootstrap CSS 文件的后面。注意,如果你把它放到媒体查询中,也可以略去 <code>!important</code> 。</li>
+						    <li>如果使用了导航条,需要移除所有导航条的折叠和展开行为。</li>
+						    <li>对于栅格布局,额外增加 <code>.col-xs-*</code> 类或替换掉 <code>.col-md-*</code> 和 <code>.col-lg-*</code>。 不要担心,针对超小屏幕设备的栅格系统能够在所有分辨率的环境下展开。</li>
+						  </ol>
+						  <p>针对 IE8 仍然需要额外引入 Respond.js 文件(由于仍然利用了浏览器对媒体查询(media query)的支持,因此还需要做处理)。这样就禁用了 Bootstrap 对移动设备的响应式支持。</p>
+
+						  <h2 id="bootstrap"><a class="anchorjs-link " href="#bootstrap" aria-label="Anchor link for: bootstrap" data-anchorjs-icon="" style="font-family: anchorjs-icons; font-style: normal; font-variant: normal; font-weight: normal; position: absolute; margin-left: -1em; padding-right: 0.5em;"></a>禁止响应式特性的 Bootstrap 模版</h2>
+						  <p>我们已经按照上面的步骤制作了一份案例。仔细阅读其源码并对照上面的步骤实践一下吧。</p>
+						  <p>
+						    <a href="../examples/non-responsive/" class="btn btn-primary">非响应式布局实例</a>
+						  </p>
+					</div>
+				</div>
+        	</div>
+
+        	<div class="col-md-3" role="complementary">
+				<nav class="bs-docs-sidebar hidden-print hidden-xs hidden-sm affix-top">
+					<ul class="nav bs-docs-sidenav">
+
+						<li class="">
+							<a href="#download">下载</a>
+						</li>
+						<li class="">
+							<a href="#whats-included">包含的内容</a>
+							<ul class="nav">
+								<li class=""><a href="#whats-included-precompiled">预编译版</a></li>
+								<li class=""><a href="#whats-included-source">Bootstrap 源码</a></li>
+							</ul>
+						</li>
+
+						<li class="">
+						<a href="#template">基本模板</a>
+						</li>
+					</ul>
+
+					<a class="back-to-top" href="#top">
+						返回顶部
+					</a>
+
+				</nav>
+			</div>
+        </div>
+
+    </div> <!-- /container -->
+    
+    <div class="footer" style="display:none;">
+		<div class="container small text-center">
+		  <p id="dever_copyright">
+			<span>Made With Love By The EST Group.</span>
+		  </p>
+
+		  <p id="dever_icp">
+			<span>Made With Love By The EST Group.</span>
+		  </p>
+		</div>
+	</div>
+	<div id="dever_code"></div>
+
+    <script type="text/javascript" src="../script/lib/jquery/jquery.min.js"></script>
+	<script type="text/javascript" src="../script/lib/bootstrap/js/bootstrap.min.js"></script>
+    <script type="text/javascript" src="../script/lib/doc/doc.min.js"></script>
+    <script type="text/javascript" src="../script/lib/doc/main.js"></script>
+  </body>
+</html>

+ 1 - 1
database/api.php

@@ -97,7 +97,7 @@ return array
 			'match' 	=> 'is_string',
 			'update'	=> 'text',
 			'search'	=> 'fulltext',
-			'list'		=> 'Dever::load("manage/api.getHtml", "{name}", "{site}", "'.$html.'", {id}, "{project}")',
+			'list'		=> 'Dever::load("manage/api.getHtml", "{name}", "{site}", {id}, "{project}")',
 			'modal'		=> '点此查看',
 			//'bind'		=> array('onclick', 'checking', array('url' => Dever::url("manage/api.load?json=1"))),
 		),

+ 2 - 2
database/role.php

@@ -127,9 +127,9 @@ $config = array
 			'list'		=> true,
 		),
 
-		'hr0'		=> array
+		'hr1'		=> array
 		(
-			'name' 		=> '基本置',
+			'name' 		=> '基本置',
 			'class'		=> '',//本项必须填写
 			'attr'		=> '',
 		),

+ 2 - 1
src/Api.php

@@ -424,7 +424,7 @@ class Api
     }
 
 
-    public function getHtml($name, $site, $html, $id, $project)
+    public function getHtml($name, $site, $id, $project)
     {
         $one = array
         (
@@ -432,6 +432,7 @@ class Api
         );
         $request = Dever::db('manage/api_request')->all($one);
         $response = Dever::db('manage/api_response')->all($one);
+        $html = Dever::db('manage/api')->config['html'];
 
         $request = $this->showTable($request);
         $response = $this->showTable($response);

+ 3 - 3
src/Opt.php

@@ -77,7 +77,7 @@ class Opt
 		$table .= '</table>';
 		
 		if ($opt['col_index']) {
-			$table .= '<br /><b style="color:red">已为('.$opt['col_index'].')建立索引,版本号:<input type="text" id="version_'.$opt['id'].'" class="form-control " value="'.$opt['version'].'"></b>';
+			$table .= '<br /><b style="color:red">已为('.$opt['col_index'].')建立索引,版本号:<input type="text" id="version_'.$opt['id'].'" class="form-control layui-input" style="width:300px;display: inline;" value="'.$opt['version'].'"></b>';
 		} else {
 			$table .= '<input type="hidden" id="version_'.$opt['id'].'" class="form-control " value="0">';
 		}
@@ -87,11 +87,11 @@ class Opt
 			
 			$result['index'] = $index;
 			
-			$table .= '<br /><br /><b style="color:blue">建议索引:'.self::INDEX.'-<input type="text" style="width:300px;" id="index_'.$opt['id'].'" class="form-control " value="'.$index.'"></b>';
+			$table .= '<br /><br /><b style="color:blue">建议索引:'.self::INDEX.'-<input type="text" style="width:300px;display: inline;" id="index_'.$opt['id'].'" class="form-control layui-input" value="'.$index.'"></b>';
 			
 			$url = Dever::url('opt.index?id=' . $opt['id']);
 			
-			$table .= '&nbsp;&nbsp;&nbsp;&nbsp;<a class="btn btn-default" onclick="load(\''.$url.'\' + \'&version=\' + $(\'#version_'.$opt['id'].'\').val() + \'&index=\' + $(\'#index_'.$opt['id'].'\').val())">点此更新索引</a>';
+			$table .= '&nbsp;&nbsp;&nbsp;&nbsp;<a class="btn btn-default layui-btn layuiadmin-btn-list" onclick="load(\''.$url.'\' + \'&version=\' + $(\'#version_'.$opt['id'].'\').val() + \'&index=\' + $(\'#index_'.$opt['id'].'\').val())">点此更新索引</a>';
 		}
 		
 		$result['text'] = $table;