更换代码高亮主题

KevinJay · Jun 15, 2017 · 27717a5 · 27717a5
1 parent 04f87af
commit 27717a5
Show file tree

Hide file tree

Showing 47 changed files with 14 additions and 6,042 deletions.
diff --git a/app/config/system/system_dev.php b/app/config/system/system_dev.php
@@ -79,7 +79,7 @@
             'port' => 3306,
             'username' => 'admin',
             'password' => 'admin',
-            'dbname' => 'test',
+            'dbname' => 'PhalconCMS',
             'charset' => 'utf8',
         ),
 

diff --git a/app/frontend/controllers/ArticleController.php b/app/frontend/controllers/ArticleController.php
@@ -78,6 +78,7 @@ protected function set_articles_list(){
         $page = intval($this -> request -> get('page', 'trim'));
         $keyword = $this -> request -> get('keyword', 'remove_xss');
         $ext['keyword'] = $keyword;
+        $cid = 0;
         if($this -> dispatcher -> hasParam('category')){
             $category = $this -> dispatcher -> getParam('category', 'trim');
             if(intval($category) <= 0){
@@ -88,6 +89,7 @@ protected function set_articles_list(){
             }
             $ext['cid'] = $cid;
         }
+        $tid = 0;
         if($this -> dispatcher -> hasParam('tag')){
             $tag = $this -> dispatcher -> getParam('tag', 'trim');
             if(intval($tag) <= 0){

diff --git a/app/frontend/views/public/footer.phtml b/app/frontend/views/public/footer.phtml
@@ -14,61 +14,6 @@
     <a id="float_gotop" class="floatbtn" href="javascript:void()" onClick="goRoll(0)" title="返回顶部"></a>
     <a id="float_goend" class="floatbtn" href="javascript:void()" onClick="goend()" title="转到底部"></a>
 </div>
-<script>
-    if (typeof(SyntaxHighlighter) !== undefined) {
-        var preList = document.getElementsByTagName('pre');
-        for (var i = 0; i < preList.length; i ++) {
-            var children = preList[i].getElementsByTagName('code');
-            if (children.length > 0) {
-                var language = 'plain';
-                var code = children[0], className = code.className;
-                if (!!className) {
-                    var match = XRegExp.exec(className, XRegExp('^lang-(?<language>.*)$'));
-                    if (match && match.language) {
-                        language = match.language;
-                    }
-                }
-                preList[i].className = 'brush: ' + language;
-                preList[i].innerHTML = code.innerHTML;
-            }
-        }
-        SyntaxHighlighter.autoloader(
-            'applescript           {{ static_url("highlight/scripts/shBrushAppleScript.js") }}',
-            'ahk autohotkey        {{ static_url("highlight/scripts/shBrushAhk.js") }}',
-            'actionscript3 as3     {{ static_url("highlight/scripts/shBrushAS3.js") }}',
-            'bash shell            {{ static_url("highlight/scripts/shBrushBash.js") }}',
-            'bat cmd batch         {{ static_url("highlight/scripts/shBrushBat.js") }}',
-            'coldfusion cf         {{ static_url("highlight/scripts/shBrushColdFusion.js") }}',
-            'cpp c                 {{ static_url("highlight/scripts/shBrushCpp.js") }}',
-            'c# c-sharp csharp     {{ static_url("highlight/scripts/shBrushCSharp.js") }}',
-            'css                   {{ static_url("highlight/scripts/shBrushCss.js") }}',
-            'delphi pascal pas     {{ static_url("highlight/scripts/shBrushDelphi.js") }}',
-            'diff patch            {{ static_url("highlight/scripts/shBrushDiff.js") }}',
-            'erl erlang            {{ static_url("highlight/scripts/shBrushErlang.js") }}',
-            'groovy                {{ static_url("highlight/scripts/shBrushGroovy.js") }}',
-            'java                  {{ static_url("highlight/scripts/shBrushJava.js") }}',
-            'jfx javafx            {{ static_url("highlight/scripts/shBrushJavaFX.js") }}',
-            'js jscript javascript {{ static_url("highlight/scripts/shBrushJScript.js") }}',
-            'perl pl               {{ static_url("highlight/scripts/shBrushPerl.js") }}',
-            'php                   {{ static_url("highlight/scripts/shBrushPhp.js") }}',
-            'text plain            {{ static_url("highlight/scripts/shBrushPlain.js") }}',
-            'powershell ps         {{ static_url("highlight/scripts/shBrushPowerShell.js") }}',
-            'py python             {{ static_url("highlight/scripts/shBrushPython.js") }}',
-            'ruby rails ror rb     {{ static_url("highlight/scripts/shBrushRuby.js") }}',
-            'sass scss             {{ static_url("highlight/scripts/shBrushSass.js") }}',
-            'scala                 {{ static_url("highlight/scripts/shBrushScala.js") }}',
-            'sql                   {{ static_url("highlight/scripts/shBrushSql.js") }}',
-            'vb vbnet              {{ static_url("highlight/scripts/shBrushVb.js") }}',
-            'xml xhtml xslt html   {{ static_url("highlight/scripts/shBrushXml.js") }}'
-        );
-        SyntaxHighlighter.defaults['auto-links'] = true;
-        SyntaxHighlighter.defaults['collapse'] = false;
-        SyntaxHighlighter.defaults['gutter'] = true;
-        SyntaxHighlighter.defaults['smart-tabs'] = false;
-        SyntaxHighlighter.defaults['tab-size'] = 4;
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    }
 
-
-</script>
+<script src='{{ static_url("highlight/scripts/highlight.min.js?_v=")~assetsVersion }}'></script>
+<script >hljs.initHighlightingOnLoad();</script>
diff --git a/app/frontend/views/public/header.phtml b/app/frontend/views/public/header.phtml
@@ -15,7 +15,7 @@
 <script type="text/javascript" src='{{ static_url("assets/js/frontopen.js?_v=")~assetsVersion }}'></script>
 <link rel="stylesheet" type="text/css" media="all" href='{{ static_url("assets/css/style.css?_v=")~assetsVersion }}'/>
 <link rel="stylesheet" type="text/css" media="all" href='{{ static_url("assets/css/mobile.css?_v=")~assetsVersion }}'/>
-<link rel="stylesheet" type="text/css" media="all" href='{{ static_url("highlight/styles/shCoreDefault.css?_v=")~assetsVersion }}'/>
+<link rel="stylesheet" href='{{ static_url("highlight/styles/zenburn.min.css?_v=")~assetsVersion }}'>
 
 <!--[if lt IE 9]>
 <script src="./home/html5.js"></script><![endif]-->

diff --git a/public/home/assets/css/style.css b/public/home/assets/css/style.css
@@ -128,8 +128,8 @@ a.more-link:hover{color:#FFF}
 .entry-content a:hover{color:#00BCF2}
 .entry-content .j_zeng a{color:#fff}
 .entry-content p{margin:0 0 15px 0}
-.entry-content h2{border-left:5px solid #FF6100; padding:5px; padding-left:10px; margin:20px 0; background:#fff; font-size:20px;}
-.entry-content h3{margin-top:30px; margin-bottom:10px; border-bottom:1px solid #ddd; font-size:inherit;}
+.entry-content h2, .c-con h2{border-left:5px solid #FF6100; padding:5px; padding-left:10px; margin:20px 0; background:#fff; font-size:20px;}
+.entry-content h3, .c-con h3{margin-top:30px; margin-bottom:10px; border-bottom:1px solid #ddd;}
 .entry-title{font-size:20px;color:#FF6100;overflow:hidden;height:33px;font-weight:normal; line-height:33px;border-bottom:1px solid #DFDFDF;}
 .c-top2{margin-bottom: 1px;height: 55px;overflow: hidden;background: #fff;padding: 10px;}
 .ds-powered-by{display:none}
@@ -451,4 +451,5 @@ div.bbp-template-notice.info{background:#f0f8ff}
 .site-info{
     padding:10px 0px;
 }
-/*前台登录窗体结束*/
+/*前台登录窗体结束*/
+.entry-content pre code, .c-con pre code{font-family: Menlo,Monaco,Consolas,"Courier New",monospace;}
diff --git a/public/home/highlight/scripts/highlight.min.js b/public/home/highlight/scripts/highlight.min.js
diff --git a/public/home/highlight/scripts/shAutoloader.js b/public/home/highlight/scripts/shAutoloader.js
diff --git a/public/home/highlight/scripts/shBrushAS3.js b/public/home/highlight/scripts/shBrushAS3.js