diff --git a/data/dashbord.xlsx b/data/dashbord.xlsx index bf6e837..430b97a 100644 Binary files a/data/dashbord.xlsx and b/data/dashbord.xlsx differ diff --git a/data/~$dashbord.xlsx b/data/~$dashbord.xlsx deleted file mode 100644 index 6a5a056..0000000 Binary files a/data/~$dashbord.xlsx and /dev/null differ diff --git a/main.nim b/main.nim index 409d570..1820be9 100644 --- a/main.nim +++ b/main.nim @@ -260,7 +260,7 @@ when isMainModule: # ---------------------------- # #include "tmpl/main.tmpl" include "tmpl/user.nim" -include "tmpl/dashboard.nim" +include "tmpl/dashbord/dashboard.nim" include "tmpl/website.nim" diff --git a/public/js/main.js b/public/js/main.js index 02ba328..831e51d 100755 --- a/public/js/main.js +++ b/public/js/main.js @@ -86,20 +86,21 @@ /*================================================================== [ Open Window on link with id="openWindow" ]*/ - document.addEventListener("click", FromIdNavigateTo, false); - function FromIdNavigateTo(event) { - if (event.target.matches("#openWindow")) { - // console("Open link on open Window"); - window.open( - event.target.href, - "_blank", - "menubar=no,toolbar=no,location=no,directories=no,status=no,scrollbars=no,resizable=yes,dependent,width=800,height=620,left=0,top=0" - ); - } else { - // console("Open link on new tab"); - open(event.target.href, "_blank"); - } - event.preventDefault(); - return false; - } + // document.addEventListener("click", FromIdNavigateTo, false); + // function FromIdNavigateTo(event) { + // if (event.target.matches("#openWindow")) { + // // console("Open link on open Window"); + // window.open( + // event.target.href, + // "_blank", + // "menubar=no,toolbar=no,location=no,directories=no,status=no,scrollbars=no,resizable=yes,dependent,width=800,height=620,left=0,top=0" + // ); + // } + // else { + // // console("Open link on new tab"); + // open(event.target.href, "_blank"); + // } + // event.preventDefault(); + // return false; + // } })(jQuery); diff --git a/tmpl/dashboard.nim b/tmpl/dashbord/dashboard.nim similarity index 99% rename from tmpl/dashboard.nim rename to tmpl/dashbord/dashboard.nim index 788650a..84ea9cf 100644 --- a/tmpl/dashboard.nim +++ b/tmpl/dashbord/dashboard.nim @@ -1,6 +1,6 @@ #? stdtmpl | standard # -# import snippet_icons +# import ../snippets/snippet_icons #proc dashboardHtml(columnLeftInfo: var ColomnLeftData): string = # result = ""
diff --git a/tmpl/dashbord/left_dashbord.nim b/tmpl/dashbord/left_dashbord.nim new file mode 100644 index 0000000..e69de29 diff --git a/tmpl/snippet_html.nim b/tmpl/snippets/snippet_html.nim similarity index 98% rename from tmpl/snippet_html.nim rename to tmpl/snippets/snippet_html.nim index f905d4b..ba3ea6e 100644 --- a/tmpl/snippet_html.nim +++ b/tmpl/snippets/snippet_html.nim @@ -1,5 +1,5 @@ import templates -import ../nim-lib/outils/web/web_utils +import ../../nim-lib/outils/web/web_utils # --==--==--==--==--==--==--==--==--==--==-- # # SVG : HTML title H2 diff --git a/tmpl/snippet_icons.nim b/tmpl/snippets/snippet_icons.nim similarity index 100% rename from tmpl/snippet_icons.nim rename to tmpl/snippets/snippet_icons.nim diff --git a/tmpl/tests/test_bouton.nim b/tmpl/tests/test_bouton.nim index 0f13e52..719bd3a 100644 --- a/tmpl/tests/test_bouton.nim +++ b/tmpl/tests/test_bouton.nim @@ -1,5 +1,5 @@ #? stdtmpl | standard -# import ../snippet_icons +# import ../snippets/snippet_icons #proc test_bouton(columnLeftInfo: var ColomnLeftData): string = # result = "" diff --git a/tmpl/tests/test_notebooks.nim b/tmpl/tests/test_notebooks.nim index 410e4e6..bf4e8d3 100644 --- a/tmpl/tests/test_notebooks.nim +++ b/tmpl/tests/test_notebooks.nim @@ -1,5 +1,5 @@ #? stdtmpl | standard -# import ../snippet_html +# import ../snippets/snippet_html #proc test_notebooks(c: var TData, columnLeftInfo: var ColomnLeftData): string = # result = "" diff --git a/tmpl/tests/test_notes.nim b/tmpl/tests/test_notes.nim index 9085a3f..976abf7 100644 --- a/tmpl/tests/test_notes.nim +++ b/tmpl/tests/test_notes.nim @@ -1,5 +1,5 @@ #? stdtmpl | standard -# import ../snippet_html +# import ../snippets/snippet_html #proc test_notes(c: var TData, columnLeftInfo: var ColomnLeftData): string = # result = "" diff --git a/tmpl/tests/test_ping.nim b/tmpl/tests/test_ping.nim index fb85b6e..4c0ff67 100644 --- a/tmpl/tests/test_ping.nim +++ b/tmpl/tests/test_ping.nim @@ -1,5 +1,5 @@ #? stdtmpl | standard -# import ../snippet_html +# import ../snippets/snippet_html # #proc test_ping(c: var TData, ping: joplin_ping): string = # result = "" diff --git a/tmpl/tests/test_tags.nim b/tmpl/tests/test_tags.nim index 6fd11c2..ab27f3e 100644 --- a/tmpl/tests/test_tags.nim +++ b/tmpl/tests/test_tags.nim @@ -1,5 +1,5 @@ #? stdtmpl | standard -# import ../snippet_html +# import ../snippets/snippet_html #proc test_tags(c: var TData, columnLeftInfo: var ColomnLeftData): string = # result = "" diff --git a/tmpl/website.nim b/tmpl/website.nim index 74031e1..07deb61 100644 --- a/tmpl/website.nim +++ b/tmpl/website.nim @@ -11,8 +11,8 @@ #end proc # -# import snippet_html -# import snippet_icons +# import snippets/snippet_html +# import snippets/snippet_icons #proc genSecret(c: var TData, columnLeftInfo: var ColomnLeftData, ColomnRightInfo: var ColomnRightData): string = # result = "" @@ -282,8 +282,7 @@
- # var dashboardHTML = dashboardHtml(columnLeftInfo) - ${dashboardHTML} +
@@ -303,7 +302,9 @@ # else :

Click on note to see it !!

# end if - + # elif columnLeftInfo.option == dashbord: + # var dashboardHTML = dashboardHtml(columnLeftInfo) + ${dashboardHTML} # end if