3011

backend/web/plugins/editormd/editormd.js

@@ -71,7 +71,7 @@
             "list-ul", "list-ol", "hr", "|",
             "link", "reference-link", "image", "code", "preformatted-text", "code-block", "table", "datetime", "emoji", "html-entities", "pagebreak", "|",
             "goto-line", "watch", "preview", "fullscreen", "clear", "search", "|",
-            "help", "info"
+            "help", "info", "carousel"
         ],
         simple : [
             "undo", "redo", "|", 
@@ -222,7 +222,8 @@
             fullscreen       : "fa-arrows-alt",
             clear            : "fa-eraser",
             help             : "fa-question-circle",
-            info             : "fa-info-circle"
+            info             : "fa-info-circle",
+            carousel         : "fa-sliders",
         },        
         toolbarIconTexts     : {},
         
@@ -268,7 +269,8 @@
                 clear            : "清空",
                 search           : "搜索",
                 help             : "使用帮助",
-                info             : "关于" + editormd.title
+                info             : "关于" + editormd.title,
+                carousel         : "carousel"
             },
             buttons : {
                 enter  : "确定",
@@ -2911,6 +2913,22 @@
             cm.setSelections(selections);
         },
 
+        carousel : function() {
+            var cm        = this.cm;
+            var cursor    = cm.getCursor();
+            var selection = cm.getSelection();
+
+            if (cursor.ch !== 0)
+            {
+                cm.setCursor(cursor.line, 0);
+                cm.replaceSelection("__CAROUSEL__ " + selection);
+                cm.setCursor(cursor.line, cursor.ch + 2);
+            }
+            else
+            {
+                cm.replaceSelection("__CAROUSEL__ " + selection);
+            }
+        },
         h1 : function() {
             var cm        = this.cm;
             var cursor    = cm.getCursor();

frontend/web/.htaccess

@@ -5,17 +5,17 @@ RewriteCond %{HTTP_HOST} ^www.task-on\.com$ [NC]
 RewriteRule ^(.*)$ http://task-on.com/$1 [R=301,L]
 
 RewriteCond %{THE_REQUEST} ^[A-Z]{3,9}\ /index\.php\ HTTP/
-RewriteRule ^index\.php$ https://task-on.com/ [R=301,L]
+RewriteRule ^index\.php$ http://task-on.com/ [R=301,L]
 
 RewriteCond %{HTTP_HOST}        ^www\.(.*)      [NC]
 RewriteRule ^(.*)$ http://%1/$1 [R=301,L]
 
-RewriteCond %{HTTPS} off
-RewriteRule (.*) https://%{HTTP_HOST}%{REQUEST_URI} [R,L]
+RewriteCond %{HTTP} off
+RewriteRule (.*) http://%{HTTP_HOST}%{REQUEST_URI} [R,L]
 
 RewriteCond %{REQUEST_FILENAME} !-d
 RewriteCond %{REQUEST_URI} ^(.+)/$
-RewriteRule ^(.+)/$ https://task-on.com/$1 [R=301,L]
+RewriteRule ^(.+)/$ http://task-on.com/$1 [R=301,L]
 
 Redirect 301 /portfolio/appl  /portfolio