rabin 7 years ago
parent
commit
bbed8c6e56

+ 16 - 2
README.md

@@ -1,4 +1,18 @@
 # plant
 
-plant是一个小型社区项目,也可以把它当作一个博客来使用,本人就是用该程序搭建的博客:
-5dev.cn
+plant是一个小型社区项目,也可以把它当作一个博客来使用,本人的博客就是用该程序搭建的:
+5dev.cn
+
+请先安装dm工具:
+1、git clone http://git.dever.cc:3000/python/dm.git
+2、cd dm
+3、chmod +x install
+4、./install
+
+安装plant:
+1、dm use dever
+2、dm init
+3、dm product plant
+
+更新:
+dm product plant

+ 1 - 1
config/base.php

@@ -32,7 +32,7 @@ $config['template'] = array
 	'strip' => true,
 
 	# 是否启用layout 如启用,填写要替换的class或者id即可,具体效果可参考youtube,只加载部分内容,前端请加载pjax.js
-	'layout' => 'body',
+	'layout' => '.pjax-content',
 );
 
 return $config;

File diff suppressed because it is too large
+ 0 - 5
data/assets/plant/main/647b51f0a73dc673c2f42d56e3622ab7.js


File diff suppressed because it is too large
+ 0 - 0
data/assets/plant/main/bd546dff1b478ab698d4294db4a20abf.css


File diff suppressed because it is too large
+ 0 - 1
data/assets/plant/main/bd546dff1b478ab698d4294db4a20abf.js


+ 20 - 18
data/assets/plant/main/e9a03f7fa35272c6b191bf01f5fb1eb7.js

@@ -691,24 +691,26 @@ var _Dever_Editor =
             ];
         }
         
-        this.editors[id] = new Simditor({
-            textarea: e,
-            upload:
-            {
-                url: config.upload + '.simditor',
-                params: {key:key},
-                fileKey: 'file',
-                connectionCount: 10,
-                leaveConfirm: 'Uploading is in progress, are you sure to leave this page?'
-            },
-            toolbar : toolbar
-            /*
-            ,emoji: 
-            {
-                imagePath: config.lib + 'simditor/plugins/emoji/images/emoji/'
-            }
-            */
-        });
+        if (typeof(this.editors[id]) == "undefined")  {
+            this.editors[id] = new Simditor({
+                textarea: e,
+                upload:
+                {
+                    url: config.upload + '.simditor',
+                    params: {key:key},
+                    fileKey: 'file',
+                    connectionCount: 10,
+                    leaveConfirm: 'Uploading is in progress, are you sure to leave this page?'
+                },
+                toolbar : toolbar
+                /*
+                ,emoji: 
+                {
+                    imagePath: config.lib + 'simditor/plugins/emoji/images/emoji/'
+                }
+                */
+            });
+        }
     }
 	
 	,SetMark : function()

File diff suppressed because it is too large
+ 0 - 144
data/assets/plant/manage/0f8d41faa7fa8b71eeab5d3b86ef1e05.js


File diff suppressed because it is too large
+ 0 - 0
data/assets/plant/manage/d2c1134a6a390bb5954cdb0c6d508e92.css


File diff suppressed because it is too large
+ 0 - 3
data/assets/plant/manage/d2c1134a6a390bb5954cdb0c6d508e92.js


File diff suppressed because it is too large
+ 0 - 0
data/compile/plant/main/default/doc/view.cmp.php


File diff suppressed because it is too large
+ 0 - 0
data/compile/plant/main/default/forum/list.cmp.php


File diff suppressed because it is too large
+ 0 - 0
data/compile/plant/main/default/forum/post.cmp.php


File diff suppressed because it is too large
+ 0 - 0
data/compile/plant/main/default/forum/view.cmp.php


+ 1 - 1
data/compile/plant/main/default/home.cmp.php

@@ -1,3 +1,3 @@
 <?php Dever::setInput("model_page", 1) ?>
 <?php Dever::setInput("home", 1) ?>
-<!DOCTYPE html> <?php if(isset($_SERVER["HTTP_X_PJAX"])): ?><?php else: ?><!--power by dever--><html lang="zh-CN"> <head>      <?php require Dever::config("base")->data . 'compile/plant/main/default/inc/head.cmp.php' ?> </head>  <body><?php endif; ?>     <?php require Dever::config("base")->data . 'compile/plant/main/default/inc/nav.cmp.php' ?>      <div class="pjax-content"> 	    <div class="container">  			 		  <div id="dever_notice" class="dever-box text-center" style="<?php if(!(Dever::markdown(Dever::load("main/config-one#notice", 1)))): ?>display:none;<?php endif; ?>"><?php  echo Dever::markdown(Dever::load("main/config-one#notice", 1)) ?></div> 		   		  <div class="col-md-12 dever-content"> 			   			  <?php require Dever::config("base")->data . 'compile/plant/main/default/forum/model/top.cmp.php' ?> 			   			  <?php require Dever::config("base")->data . 'compile/plant/main/default/forum/model/right.cmp.php' ?> 			   			  <?php require Dever::config("base")->data . 'compile/plant/main/default/forum/model/bottom.cmp.php' ?> 			   		  </div> 		   	    </div>  	     	    <?php require Dever::config("base")->data . 'compile/plant/main/default/inc/foot.cmp.php' ?>  	    <?php require Dever::config("base")->data . 'compile/plant/main/default/inc/script.cmp.php' ?> 	  </div>        <?php if(isset($_SERVER["HTTP_X_PJAX"])): ?><?php else: ?></body> </html><?php endif; ?>
+<!DOCTYPE html> <?php if(isset($_SERVER["HTTP_X_PJAX"])): ?><?php else: ?><!--power by dever--><html lang="zh-CN"> <head>      <?php require Dever::config("base")->data . 'compile/plant/main/default/inc/head.cmp.php' ?> </head>  <body>     <?php require Dever::config("base")->data . 'compile/plant/main/default/inc/nav.cmp.php' ?>      <div class="pjax-content"><?php endif; ?> 	    <div class="container">  			 		  <div id="dever_notice" class="dever-box text-center" style="<?php if(!(Dever::markdown(Dever::load("main/config-one#notice", 1)))): ?>display:none;<?php endif; ?>"><?php  echo Dever::markdown(Dever::load("main/config-one#notice", 1)) ?></div> 		   		  <div class="col-md-12 dever-content"> 			   			  <?php require Dever::config("base")->data . 'compile/plant/main/default/forum/model/top.cmp.php' ?> 			   			  <?php require Dever::config("base")->data . 'compile/plant/main/default/forum/model/right.cmp.php' ?> 			   			  <?php require Dever::config("base")->data . 'compile/plant/main/default/forum/model/bottom.cmp.php' ?> 			   		  </div> 		   	    </div>  	     	    <?php require Dever::config("base")->data . 'compile/plant/main/default/inc/foot.cmp.php' ?>  	    <?php require Dever::config("base")->data . 'compile/plant/main/default/inc/script.cmp.php' ?> 	  <?php if(isset($_SERVER["HTTP_X_PJAX"])): ?><?php else: ?></div>        </body> </html><?php endif; ?>

+ 1 - 1
data/compile/plant/main/default/inc/head.cmp.php

@@ -1 +1 @@
-<meta charset="utf-8"> <title><?php  echo isset($title) ? $title . "_" . Dever::load("main/config-one#title", 1) : Dever::load("main/config-one#title", 1) ?></title> <meta name="keywords" content="<?php  echo Dever::load("main/config-one#keyword", 1) ?>" /> <meta name="description" content="<?php  echo Dever::load("main/config-one#description", 1) ?>" />  <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="<?php echo Dever::config("host")->merge ?>main/992cef672f31a334119b6b45681e92ba.css?v1510583863" />     <script type="text/javascript" src="<?php echo Dever::config("host")->merge ?>main/992cef672f31a334119b6b45681e92ba.js?v1510583863"></script> <script id="script"><?php  echo Dever::script() ?>config.uid=<?php  echo Dever::load("passport/user.data") ? Dever::load("passport/user.data#id") : -1 ?></script>         
+<meta charset="utf-8"> <title><?php  echo isset($title) ? $title . "_" . Dever::load("main/config-one#title", 1) : Dever::load("main/config-one#title", 1) ?></title> <meta name="keywords" content="<?php  echo Dever::load("main/config-one#keyword", 1) ?>" /> <meta name="description" content="<?php  echo Dever::load("main/config-one#description", 1) ?>" />  <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="<?php echo Dever::config("host")->merge ?>main/992cef672f31a334119b6b45681e92ba.css?v1510651712" />     <script type="text/javascript" src="<?php echo Dever::config("host")->merge ?>main/992cef672f31a334119b6b45681e92ba.js?v1510651712"></script> <script id="script"><?php  echo Dever::script() ?>config.uid=<?php  echo Dever::load("passport/user.data") ? Dever::load("passport/user.data#id") : -1 ?></script>         

+ 1 - 1
data/compile/plant/main/default/inc/script.cmp.php

@@ -1 +1 @@
-<script type="text/javascript" src="<?php echo Dever::config("host")->merge ?>main/e9a03f7fa35272c6b191bf01f5fb1eb7.js?v1510583863"></script>             
+<script type="text/javascript" src="<?php echo Dever::config("host")->merge ?>main/e9a03f7fa35272c6b191bf01f5fb1eb7.js?v1510651712"></script>               <script> $(function() {     Dever.Init(); }); </script>

+ 1 - 1
data/compile/plant/main/default/login.cmp.php

@@ -1,2 +1,2 @@
 <?php $data['passport/login.check']=Dever::load('passport/login.check') ?>
-<!DOCTYPE html> <?php if(isset($_SERVER["HTTP_X_PJAX"])): ?><?php else: ?><!--power by dever--><html lang="zh-CN"> <head>      <?php require Dever::config("base")->data . 'compile/plant/main/default/inc/head.cmp.php' ?> </head>  <body><?php endif; ?>     <?php require Dever::config("base")->data . 'compile/plant/main/default/inc/nav.cmp.php' ?>     <div class="pjax-content">       <div class="container">    				   				  <div class="row">       <div class="col-md-4 col-md-offset-4">         <div class="panel panel-default">           <div class="panel-heading">             <h3 class="panel-title">登 录</h3>           </div>           <div class="panel-body">   			<input type="hidden" name="refer" id="refer" value="<?php  echo Dever::input("refer") ?>" check="<?php echo $data['passport/login.check'] ?>">                <fieldset>                 <div class="form-group">   				邮 箱:<input class="form-control dever-input" id="email" name="email" type="text">   	          </div>   	          <div class="form-group">   				密 码:<input class="form-control dever-input" id="password" name="password" type="password">   	          </div>   	          <div class="alert alert-warning" style="display:none;">                     需要登录后才能继续操作.                  </div>                 <input class="btn btn-lg btn-success btn-block" id="login" type="submit" value="马上登录">               </fieldset>            </div>         </div>       </div>     </div>     			</div>               <?php require Dever::config("base")->data . 'compile/plant/main/default/inc/foot.cmp.php' ?>        <?php require Dever::config("base")->data . 'compile/plant/main/default/inc/script.cmp.php' ?>     </div>        <?php if(isset($_SERVER["HTTP_X_PJAX"])): ?><?php else: ?></body> </html><?php endif; ?>
+<!DOCTYPE html> <?php if(isset($_SERVER["HTTP_X_PJAX"])): ?><?php else: ?><!--power by dever--><html lang="zh-CN"> <head>      <?php require Dever::config("base")->data . 'compile/plant/main/default/inc/head.cmp.php' ?> </head>  <body>     <?php require Dever::config("base")->data . 'compile/plant/main/default/inc/nav.cmp.php' ?>     <div class="pjax-content"><?php endif; ?>       <div class="container">    				   				  <div class="row">       <div class="col-md-4 col-md-offset-4">         <div class="panel panel-default">           <div class="panel-heading">             <h3 class="panel-title">登 录</h3>           </div>           <div class="panel-body">   			<input type="hidden" name="refer" id="refer" value="<?php  echo Dever::input("refer") ?>" check="<?php echo $data['passport/login.check'] ?>">                <fieldset>                 <div class="form-group">   				邮 箱:<input class="form-control dever-input" id="email" name="email" type="text">   	          </div>   	          <div class="form-group">   				密 码:<input class="form-control dever-input" id="password" name="password" type="password">   	          </div>   	          <div class="alert alert-warning" style="display:none;">                     需要登录后才能继续操作.                  </div>                 <input class="btn btn-lg btn-success btn-block" id="login" type="submit" value="马上登录">               </fieldset>            </div>         </div>       </div>     </div>     			</div>               <?php require Dever::config("base")->data . 'compile/plant/main/default/inc/foot.cmp.php' ?>        <?php require Dever::config("base")->data . 'compile/plant/main/default/inc/script.cmp.php' ?>     <?php if(isset($_SERVER["HTTP_X_PJAX"])): ?><?php else: ?></div>        </body> </html><?php endif; ?>

+ 1 - 1
data/compile/plant/main/default/page.cmp.php

@@ -1,4 +1,4 @@
 <?php $title=Dever::load("main/page-one#name", Dever::input("id")) ?>
 <?php Dever::setInput("model_page", Dever::input("id") > 4 ? Dever::input("id") : 5) ?>
 <?php $title ? $title : Dever::location("404") ?>
-<!DOCTYPE html>  <?php if(isset($_SERVER["HTTP_X_PJAX"])): ?><?php else: ?><!--power by dever--><html lang="zh-CN">  <head>        <?php require Dever::config("base")->data . 'compile/plant/main/default/inc/head.cmp.php' ?>  </head>    <body><?php endif; ?>      <?php require Dever::config("base")->data . 'compile/plant/main/default/inc/nav.cmp.php' ?>      <div class="pjax-content">  	    <div class="container">  		    		  <div class="dever-content" page="init">  			    			  <?php require Dever::config("base")->data . 'compile/plant/main/default/forum/model/top.cmp.php' ?>  			    			  <?php require Dever::config("base")->data . 'compile/plant/main/default/forum/model/right.cmp.php' ?>  			    			  <?php require Dever::config("base")->data . 'compile/plant/main/default/forum/model/bottom.cmp.php' ?>  			    		  </div>  		    	    </div>   	      	    <?php require Dever::config("base")->data . 'compile/plant/main/default/inc/foot.cmp.php' ?>    	    <?php require Dever::config("base")->data . 'compile/plant/main/default/inc/script.cmp.php' ?>  	</div>          <?php if(isset($_SERVER["HTTP_X_PJAX"])): ?><?php else: ?></body>  </html><?php endif; ?>
+<!DOCTYPE html>  <?php if(isset($_SERVER["HTTP_X_PJAX"])): ?><?php else: ?><!--power by dever--><html lang="zh-CN">  <head>        <?php require Dever::config("base")->data . 'compile/plant/main/default/inc/head.cmp.php' ?>  </head>    <body>      <?php require Dever::config("base")->data . 'compile/plant/main/default/inc/nav.cmp.php' ?>      <div class="pjax-content"><?php endif; ?>  	    <div class="container">  		    		  <div class="dever-content" page="init">  			    			  <?php require Dever::config("base")->data . 'compile/plant/main/default/forum/model/top.cmp.php' ?>  			    			  <?php require Dever::config("base")->data . 'compile/plant/main/default/forum/model/right.cmp.php' ?>  			    			  <?php require Dever::config("base")->data . 'compile/plant/main/default/forum/model/bottom.cmp.php' ?>  			    		  </div>  		    	    </div>   	      	    <?php require Dever::config("base")->data . 'compile/plant/main/default/inc/foot.cmp.php' ?>    	    <?php require Dever::config("base")->data . 'compile/plant/main/default/inc/script.cmp.php' ?>  	<?php if(isset($_SERVER["HTTP_X_PJAX"])): ?><?php else: ?></div>          </body>  </html><?php endif; ?>

File diff suppressed because it is too large
+ 0 - 0
data/compile/plant/main/default/reg.cmp.php


+ 9 - 9
forum/src/Posts.php

@@ -112,7 +112,7 @@ class Posts
 
             $data = Dever::load('forum/posts-getAll', $param);
         } else {
-            //Dever::abert(404);
+            //Dever::alert(404);
             $data = array();
         }
 
@@ -158,7 +158,7 @@ class Posts
         # 检测是否登录
         $user = Dever::load('passport/user.data');
         if (!$user) {
-            Dever::abert('请先登录');
+            Dever::alert('请先登录');
         }
 
         $param['option_cate_id'] = Dever::input('cate');
@@ -167,31 +167,31 @@ class Posts
         $param['option_uid'] = $user['id'];
 
         if (!$param['option_cate_id']) {
-            Dever::abert('请选择' . Dever::load('main/config-one#catename', 1) . '');
+            Dever::alert('请选择' . Dever::load('main/config-one#catename', 1) . '');
         }
 
         $cate = Dever::load('forum/cate-one', $param['option_cate_id']);
 
         if (!Dever::load('forum/cate.auth', $cate)) {
-            Dever::abert('您没有权限在该' . Dever::load('main/config-one#catename', 1) . '下发布');
+            Dever::alert('您没有权限在该' . Dever::load('main/config-one#catename', 1) . '下发布');
         }
 
         if ($cate['type'] != 1 && $cate['cate_id'] <= 0) {
-            //Dever::abert('您所选择的'.Dever::load('main/config-one#catename', 1).'不能发布');
+            //Dever::alert('您所选择的'.Dever::load('main/config-one#catename', 1).'不能发布');
         }
 
         if (!$param['option_name']) {
-            Dever::abert('请填写标题');
+            Dever::alert('请填写标题');
         }
 
         if (!$param['option_content']) {
-            Dever::abert('请填写内容');
+            Dever::alert('请填写内容');
         }
 
         $info = Dever::load('forum/posts-one', $param);
 
         if ($info) {
-            Dever::abert('你要发布的[<a href="' . Dever::url('forum/view?id=' . $info['id'], 'main') . '" target="_blank">' . $param['option_name'] . '</a>]已经存在,请不要重复发布');
+            Dever::alert('你要发布的[<a href="' . Dever::url('forum/view?id=' . $info['id'], 'main') . '" target="_blank">' . $param['option_name'] . '</a>]已经存在,请不要重复发布');
         } else {
             $param['add_cate_id'] = $param['option_cate_id'];
             $param['add_cate_id_parent'] = $cate['cate_id'];
@@ -224,7 +224,7 @@ class Posts
         }
 
         if (!$data) {
-            Dever::abert(404);
+            Dever::alert(404);
         }
 
         $data['user_name'] = Dever::load('passport/user-one#username', $data['uid']);

+ 8 - 8
forum/src/Review.php

@@ -42,7 +42,7 @@ class Review
 
         if (!$user) {
             if ($comment == 1) {
-                Dever::abert('请先登录');
+                Dever::alert('请先登录');
             }
             $user['id'] = -1;
         }
@@ -52,31 +52,31 @@ class Review
         $param['option_uid'] = $user['id'];
 
         if (!$param['option_posts_id']) {
-            Dever::abert('请选择要评论的主题');
+            Dever::alert('请选择要评论的主题');
         }
 
         if (!$param['option_content']) {
-            Dever::abert('请填写内容');
+            Dever::alert('请填写内容');
         }
 
         $post = Dever::load('forum/posts-one', $param['option_posts_id']);
         if (!$post) {
-            Dever::abert('请选择要评论的主题');
+            Dever::alert('请选择要评论的主题');
         }
 
         $cate = Dever::load('forum/cate-one', $post['cate_id']);
         if (!$cate) {
-            Dever::abert('请选择要评论的主题');
+            Dever::alert('请选择要评论的主题');
         }
         if ($cate['comment'] == 2) {
-            Dever::abert('您还不能发布评论');
+            Dever::alert('您还不能发布评论');
         }
 
         //$info = Dever::load('forum/review-one', $param);
         $info = false;
 
         if ($info) {
-            Dever::abert('你要发布的内容已经存在,请不要重复发布');
+            Dever::alert('你要发布的内容已经存在,请不要重复发布');
         } else {
             $param['add_posts_id'] = $param['option_posts_id'];
             $param['add_content'] = $param['option_content'];
@@ -111,7 +111,7 @@ class Review
     public function info($data = array())
     {
         if (!$data) {
-            Dever::abert(404);
+            Dever::alert(404);
         }
 
         $data['content'] = Dever::markdown($data['content']);

+ 4 - 4
forum/src/Vote.php

@@ -30,7 +30,7 @@ class Vote
         # 检测是否登录
         $user = Dever::load('passport/user.data');
         if (!$user) {
-            Dever::abert('请先登录');
+            Dever::alert('请先登录');
         }
 
         $param['option_source_table'] = $this->table;
@@ -38,11 +38,11 @@ class Vote
         $param['option_uid'] = $user['id'];
 
         if (!$param['option_source_table']) {
-            Dever::abert('请选择来源');
+            Dever::alert('请选择来源');
         }
 
         if (!$param['option_source_id']) {
-            Dever::abert('请选择来源');
+            Dever::alert('请选择来源');
         }
 
         if ($param['option_source_table'] == 1) {
@@ -53,7 +53,7 @@ class Vote
 
         $check = Dever::load('forum/' . $table . '-one', $param['option_source_id']);
         if (!$check) {
-            Dever::abert('请选择来源');
+            Dever::alert('请选择来源');
         }
 
         $info = Dever::load('forum/vote-one', $param);

+ 8 - 1
main/assets/default/html/inc/script.html

@@ -11,4 +11,11 @@
 <script type="text/javascript" src="../manage/simditor/scripts/uploader.min.js"></script>
 <script type="text/javascript" src="../manage/simditor/scripts/simditor.min.js"></script>
 <script type="text/javascript" src="../manage/simditor/plugins/dropzone/simditor-dropzone.js"></script>
-<script type="text/javascript" src="../manage/highlight/highlight.min.js"></script>
+<script type="text/javascript" src="../manage/highlight/highlight.min.js"></script>
+
+<script>
+$(function()
+{
+    Dever.Init();
+});
+</script>

+ 3 - 0
package.json

@@ -0,0 +1,3 @@
+{
+	"rely": "manage,passport"
+}

Some files were not shown because too many files changed in this diff