2du 4 ani în urmă
părinte
comite
2c2d28d48f

+ 3 - 1
route/view_read.py

@@ -139,8 +139,10 @@ def view_read_2(conn, name, doc_rev, doc_from):
         div = '''
             <div id="get_user_info"></div>
             <script>load_user_info("''' + user_name + '''");</script>
+            <hr class="main_hr">
         ''' + div
-        menu += [['w/' + url_pas(name) + '/' + url_pas(get_time().split()[0]), load_lang('today_doc')]]
+        if name == 'user:' + user_name:
+            menu += [['w/' + url_pas(name) + '/' + url_pas(get_time().split()[0]), load_lang('today_doc')]]
 
     curs.execute(db_change("select data from other where name = 'body'"))
     body = curs.fetchall()

+ 1 - 1
version.json

@@ -1,6 +1,6 @@
 {
     "beta" : {
-        "r_ver" : "v3.5.0-dev (stable1) (beta2) (dev3)",
+        "r_ver" : "v3.5.0-dev (stable1) (beta2) (dev4)",
         "c_ver" : "3500101",
         "s_ver" : "3500101"
     }

+ 6 - 4
views/main_css/js/load_shortcut.js

@@ -23,12 +23,14 @@ document.onkeypress = function(e) {
         }
 
         if(window.location.pathname.match(doc_shortcut)) {
-            if(shortcut_key_list['w'] === 1) {
-                window.location.pathname = window.location.pathname.replace(doc_shortcut, '/w/');
+			let doc_href = window.location.pathname.replace(doc_shortcut, '');
+			doc_href = doc_href.replace(/%2Fdoc_from%2F(?:((?!%2F).)+)$/, '');
+			if(shortcut_key_list['w'] === 1) {
+                window.location.pathname = '/w/' + doc_href;
             } else if(shortcut_key_list['e'] === 1) {
-                window.location.pathname = window.location.pathname.replace(doc_shortcut, '/edit/');
+                window.location.pathname = '/edit/' + doc_href;
             } else if(shortcut_key_list['h'] === 1) {
-                window.location.pathname = window.location.pathname.replace(doc_shortcut, '/history/');
+                window.location.pathname = '/history/' + doc_href;
             }
         }
     }

+ 2 - 2
views/main_css/js/render_onmark.js

@@ -1289,7 +1289,7 @@ function do_onmark_render(
     var data_js = '';
     var data_backlink = [];
     var data_nowiki = {};
-    
+	
     var data_var = do_onmark_redirect_render(data, data_js, name_doc);
     data = data_var[0];
     data_js = data_var[1];
@@ -1317,7 +1317,7 @@ function do_onmark_render(
         data_nowiki = data_var[2];
 
         data = do_onmark_text_render(data);
-        data = do_onmark_heading_render(data, name_doc, name_include);
+        data = do_onmark_heading_render(data, data_js, name_doc, name_include);
         data = do_onmark_table_render(data);
 
         data_var = do_onmark_link_render(