10000 6.8 · githubsunyf/cms@475605e · GitHub
[go: up one dir, main page]
Skip to content

Commit 475605e

Browse files
starlyingstarlying
committed
6.8
1 parent 322feda commit 475605e

File tree

3 files changed

+13
-11
lines changed

3 files changed

+13
-11
lines changed

‎README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ SiteServer CMS 基于.NET 平台，能够以最低的成本、最少的人力投
1515

1616
## 迭代计划
1717

18+
[2019 年 1 月/2 月迭代计划](https://github.com/siteserver/cms/issues/1683)
19+
1820
[2018 年 11 月/12 月迭代计划](https://github.com/siteserver/cms/issues/1521)
1921

2022
[2018 年 9 月/10 月迭代计划](https://github.com/siteserver/cms/issues/1280)

‎SS.CMS.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<copyright>Copyright © SiteServer CMS 2018</copyright>
1313
<tags>SiteServer CMS</tags>
1414
<releaseNotes>
15-
SiteServer CMS V6.7正式版
15+
SiteServer CMS V6.8正式版
1616
</releaseNotes>
1717
</metadata>
1818
</package>

‎SiteServer.Web/SiteServer/main.cshtml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,13 @@
3030
</a>
3131
<ul v-if="isDesktop" id="topMenus" class="navigation-menu">
3232
<li v-for="topMenu in topMenus" class="has-submenu">
33-
<a :href="getHref(topMenu)" v-on:click="btnTopMenuClick(topMenu)" :target="getTarget(topMenu)">{{topMenu.text}}</a>
33+
<a :href="getHref(topMenu)" v-on:click="btnTopMenuClick(topMenu)" :target="getTarget(topMenu)" v-html="topMenu.text"></a>
3434
<ul v-if="topMenu.hasChildren" class="submenu">
3535
<li v-for="parentMenu in topMenu.children" :class="{'has-submenu': parentMenu.children}">
36-
<a :href="getHref(parentMenu)" v-on:click="btnTopMenuClick(parentMenu)" :target="getTarget(parentMenu)">{{parentMenu.text}}</a>
36+
<a :href="getHref(parentMenu)" v-on:click="btnTopMenuClick(parentMenu)" :target="getTarget(parentMenu)" v-html="parentMenu.text"></a>
3737
<ul v-if="parentMenu.hasChildren" class="submenu">
3838
<li v-for="childMenu in parentMenu.children">
39-
<a :href="getHref(childMenu)" v-on:click="btnTopMenuClick(childMenu)" :target="getTarget(childMenu)">{{childMenu.text}}</a>
39+
<a :href="getHref(childMenu)" v-on:click="btnTopMenuClick(childMenu)" :target="getTarget(childMenu)" v-html="childMenu.text"></a>
4040
</li>
4141
</ul>
4242
</li>
@@ -125,13 +125,13 @@
125125
<li v-for="siteMenu in siteMenus" class="has_sub">
126126
<a :href="getHref(siteMenu)" v-on:click="btnLeftMenuClick(siteMenu)" :target="getTarget(siteMenu)" :class="{'subdrop': siteMenu === activeParentMenu}">
127127
<i :class="(siteMenu.iconClass ? siteMenu.iconClass : 'ion-star')"></i>
128-
<span> {{siteMenu.text}} </span>
128+
<span v-html="siteMenu.text"></span>
129129
<span v-if="siteMenu.hasChildren" class="menu-arrow"></span>
130130
</a>
131131
<ul v-if="siteMenu.hasChildren" class="list-unstyled" v-show="siteMenu === activeParentMenu">
132132
<li v-for="childMenu in siteMenu.children" :class="{'active': childMenu === activeChildMenu}">
133133
<a :href="getHref(childMenu)" :target="getTarget(childMenu)" v-on:click="btnLeftMenuClick(childMenu)">
134-
<i :class="childMenu.iconClass"></i> {{childMenu.text}} </a>
134+
<i :class="childMenu.iconClass"></i> <span v-html="childMenu.text"></span> </a>
135135
</li>
136136
</ul>
137137
</li>
@@ -141,29 +141,29 @@
141141
<a :href="getHref(pluginMenu)" v-on:click="btnLeftMenuClick(pluginMenu)" :target="getTarget(pluginMenu)"
142142
:class="{'subdrop': pluginMenu === activeParentMenu}">
143143
<i :class="(pluginMenu.iconClass ? pluginMenu.iconClass : 'ion-star')"></i>
144-
<span> {{pluginMenu.text}} </span>
144+
<span v-html="pluginMenu.text"></span>
145145
<span v-if="pluginMenu.hasChildren" class="menu-arrow"></span>
146146
</a>
147147
<ul v-if="pluginMenu.hasChildren" class="list-unstyled" v-show="pluginMenu === activeParentMenu">
148148
<li v-for="childMenu in pluginMenu.children" :class="{'active': childMenu === activeChildMenu}">
149149
<a :href="getHref(childMenu)" :target="getTarget(childMenu)" v-on:click="btnLeftMenuClick(childMenu)">
150-
<i :class="childMenu.iconClass"></i> {{childMenu.text}} </a>
150+
<i :class="childMenu.iconClass"></i> <span v-html="childMenu.text"></span> </a>
151151
</li>
152152
</ul>
153153
</li>
154154
<template v-if="!isDesktop && isMobileMenu" v-for="topMenu in topMenus">
155-
<li class="text-muted menu-title">{{topMenu.text}}</li>
155+
<li class="text-muted menu-title" v-html="topMenu.text"></li>
156156
<li v-for="parentMenu in topMenu.children" class="has_sub">
157157
<a :href="getHref(parentMenu)" v-on:click="btnLeftMenuClick(parentMenu)" :target="getTarget(parentMenu)"
158158
:class="{'subdrop': parentMenu === activeParentMenu}">
159159
<i :class="(parentMenu.iconClass ? parentMenu.iconClass : 'ion-star')"></i>
160-
<span> {{parentMenu.text}} </span>
160+
<span v-html="parentMenu.text"></span>
161161
<span v-if="parentMenu.hasChildren" class="menu-arrow"></span>
162162
</a>
163163
<ul v-if="parentMenu.hasChildren" class="list-unstyled" v-show="parentMenu === activeParentMenu">
164164
<li v-for="childMenu in parentMenu.children" :class="{'active': childMenu === activeChildMenu}">
165165
<a :href="getHref(childMenu)" :target="getTarget(childMenu)" v-on:click="btnLeftMenuClick(childMenu)">
166-
<i :class="childMenu.iconClass"></i> {{childMenu.text}} </a>
166+
<i :class="childMenu.iconClass"></i> <span v-html="childMenu.text"< 4751 /span>></span> </a>
167167
</li>
168168
</ul>
169169
</li>

0 commit comments

Comments
 (0)
0