Ace & Markdown全新编辑器 & others

邀请注册
共享后图片可见问题 fileService::getFile()
笔记历史记录问题
共享后得到被共享者列表问题 shareService
themeService 博客主题新建问题, 模板循环引用问题
markdown编辑器双屏大小不能保存问题

app/views/member/blog/add_single.html

@@ -1,6 +1,6 @@
 {{template "member/top.html" .}}
 <div class="m-b-md"> <h3 class="m-b-none">
-{{if .page}}
+{{if .single}}
 {{msg . "updateSingle"}}
 {{else}}
 {{msg . "addSingle"}}
@@ -41,7 +41,7 @@
 
 </div>
 {{template "member/footer.html" .}}
-<script type="text/javascript" src="/tinymce/tinymce.min.js"></script>
+<script type="text/javascript" src="/tinymce/tinymce.js"></script>
 <script>
 var urlPrefix = "{{.siteUrl}}";
 $(function() {

app/views/member/blog/base.html

@@ -20,7 +20,7 @@
 						<label for="logo">{{msg . "blogLogo"}}</label>
 							<input type="hidden" name="Logo" id="Logo"
 								value="{{.userBlog.Logo}}" />
-							<form id="formLogo" action="{{$.siteUrl}}/file/uploadBlogLogo" method="post"
+							<form id="formLogo" action="/file/uploadBlogLogo" method="post"
 								enctype="multipart/form-data" target="logoTarget">
 								<input type="file" class="form-control" id="logo2" name="file"
 									onChange='$("#formLogo").submit();' /> 

app/views/member/blog/single.html

@@ -37,7 +37,7 @@
 
 </div>
 {{template "member/footer.html" .}}
-<script type="text/javascript" src="{{.siteUrl}}/public/member/js/jquery.sortable.js"></script>
+<script type="text/javascript" src="/public/member/js/jquery.sortable.js"></script>
 <script>
 $(function() {
 	$("#baseBtn").click(function(){
@@ -79,7 +79,7 @@ $(function() {
 				art.alert(re.Msg || "error");
 			}
 		});
-	});
+	});
 });
 </script>
 

app/views/member/blog/theme.html

@@ -8,6 +8,7 @@
 		</small>
 	</h3>
 </div>
+
 <div class="row">
 <div class="col-sm-12 theme-container">
 	<section class="panel panel-default">
@@ -27,8 +28,8 @@
 			<p>
 			{{msg . "currentTheme"}}:
 			</p>
-			<ul class="themes">
-				<li class="theme">	
+			<div class="themes clearfix">
+				<div class="theme pull-left">	
 				    <a class="choose-theme" data-method="put" href="#" rel="nofollow">
 				      <div class="theme-thumb thumb active-theme">
 					      <img src="/{{.activeTheme.Path}}/images/screenshot.png" alt="preview">
@@ -41,12 +42,21 @@
 				    <div class="theme-btns">
 				    	<div class="btn-group" data-id="{{.activeTheme.ThemeId.Hex}}">
 					    	<a class="btn btn-default btn-sm btn-export"><span class="fa fa-download"></span> {{msg $ "export"}}</a>
-					    	<a class="btn btn-default btn-sm" href="{{$.siteUrl}}/preview?themeId={{.activeTheme.ThemeId.Hex}}" target="_blank"><span class="fa fa-eye"></span> {{msg $ "preview"}}</a>
+					    	<!-- 必须是自己的主题 -->
+					    	{{if .activeTheme.ThemeId}}
+						    	<a class="btn btn-default btn-sm" href="{{$.siteUrl}}/preview?themeId={{.activeTheme.ThemeId.Hex}}" target="_blank"><span class="fa fa-eye"></span> {{msg $ "preview"}}</a>
+					    	{{end}}
 					    	<a class="btn btn-primary btn-sm" target="_blank" href="/member/blog/updateTheme?themeId={{if .activeTheme.ThemeId}}{{.activeTheme.ThemeId.Hex}}{{end}}"><span class="fa fa-pencil"></span> {{msg $ "edit"}}</a>
 				    	</div>
 				    </div>
-			    </li>
-			</ul>
+			    </div>
+			    {{if .activeTheme.Info.Desc}}
+			    <!-- 描述 -->
+			    <div class="pull-left theme-desc">
+			    	{{.activeTheme.Info.Desc|raw}}
+			    </div>
+			    {{end}}
+			</div>
 			
 			<hr />
 			<p>
@@ -59,6 +69,11 @@
 				    <a class="choose-theme" data-method="put" href="#" rel="nofollow">
 				      <div class="theme-thumb thumb">
 					      <img src="/{{.Path}}/images/screenshot.png" alt="preview">
+					      {{if .Info.Desc}}
+					      <div class="theme-desc-mask">
+					      	{{.Info.Desc|raw}}
+					      </div>
+					      {{end}}
 				      </div>
 				      <span class="theme-title">{{.Name}}</span>
 					</a>
@@ -100,6 +115,11 @@
 				    <a class="choose-theme" data-method="put" href="#" rel="nofollow">
 				      <div class="theme-thumb thumb">
 					      <img src="/{{.Path}}/images/screenshot.png" alt="preview">
+					      {{if .Info.Desc}}
+					      <div class="theme-desc-mask">
+					      	{{.Info.Desc|raw}}
+					      </div>
+					      {{end}}
 				      </div>
 				      <span class="theme-title">{{.Name}}</span>
 					</a>

app/views/member/blog/update_theme.html

@@ -107,7 +107,7 @@
 </div>
 
 {{template "member/footer.html" .}}
-<script src="/public/member/js/ace/ace.js" type="text/javascript"></script>
+<script src="/public/libs/ace/ace.js" type="text/javascript"></script>
 <script>
 var editor = ace.edit("tplContent");
 editor.setTheme("ace/theme/tomorrow");