diff --git a/db.js b/db.js index aa69831..42ad9f4 100644 --- a/db.js +++ b/db.js @@ -53,7 +53,6 @@ function fullPath(files) { // Load a file, parse the title and generate the HTML exports.loadPage = function (name, callback) { var path = pathFromNameMd(name); - console.log("..."+name) // if (name != "home"){ // return callback(null,{exists: false}) @@ -85,7 +84,6 @@ exports.loadPage = function (name, callback) { exports.editPage = function (name, callback) { var path = pathFromNameMd(name); - console.log(path) FS.readFile(path, 'utf8', function (err, markdown) { @@ -120,7 +118,7 @@ exports.editPage = function (name, callback) { name: name, title: null, exists: exists, - markdown: markdown, + markdown: unescape(markdown), html: html, }); @@ -131,8 +129,6 @@ exports.editPage = function (name, callback) { // Saving is simple. Just put the markdown in the file exports.savePage = function (name, value, callback) { var path = pathFromNameMd(name); - console.log(path) - console.log(value) FS.writeFile(path, value, callback); }; diff --git a/pages/01_home.markdown b/pages/01_home.markdown index 981eb8d..0a052cf 100644 --- a/pages/01_home.markdown +++ b/pages/01_home.markdown @@ -1,3 +1,6 @@ +p(#title_text)=. [THSF] 2015@Toulouse:/less/is/more + + h3. Hello THSF p(bla). this is a simple and stupid wiki :) diff --git a/pages/04_programm.markdown b/pages/04_programm.markdown new file mode 100644 index 0000000..7427b2a --- /dev/null +++ b/pages/04_programm.markdown @@ -0,0 +1,6 @@ +# 04 programm + +|_. horaire |_. intitulé |_. où | +| 8h00 | table | row 1 | +| 9h00 | table | row 2 | +| 10h00 | ma grand mere fait du ski| dans les highlands | \ No newline at end of file diff --git a/public/images/logo.png b/public/images/logo.png new file mode 100644 index 0000000..62e2189 Binary files /dev/null and b/public/images/logo.png differ diff --git a/public/js/editor.js b/public/js/editor.js index 2f17baf..cb5791b 100644 --- a/public/js/editor.js +++ b/public/js/editor.js @@ -7,7 +7,7 @@ jQuery(function($){ var tx_input = $('#tx_input'); var input = tx_input[0]; - input.value = input.innerHTML; + input.value = input.textContent; tx_input.val(input.value) var text_preview = $('#text_preview')[0]; var html_output = $('#html_output')[0]; diff --git a/public/stylesheets/style.css b/public/stylesheets/style.css index 3c5b04b..30224e6 100644 --- a/public/stylesheets/style.css +++ b/public/stylesheets/style.css @@ -7,19 +7,47 @@ body { background-color: #000000; font: 14px "Lucida Grande", Helvetica, Arial, sans-serif; color: #ffffff; + margin-left: auto; + margin-right: auto; } a { color: #00B7FF; } +#title_text{ + + font-family: "andale mono", "lucida console", monospace; + font-size:30px; +} + #home { display:block; } -#markdown-editor { - margin-top:50px; - min-width:500px; - min-height:300px; - color: #000000 +table { + margin-left: auto; + margin-right: auto; + border-collapse : collapse; +} +table th, +table td { + padding : 4px 8px; + border : 1px solid #aaa; +} +ul { + padding-left: 2em; +} + +#logo { + display: block; + margin-top: 50px; + margin-bottom: 70px; + margin-left: auto; + margin-right: auto; + width:30%; + padding: 20%; + background-image: url(../images/logo.png); + background-size: contain; + background-repeat: no-repeat; } diff --git a/views/.layout.jade.swp b/views/.layout.jade.swp index c2b15fc..734529d 100644 Binary files a/views/.layout.jade.swp and b/views/.layout.jade.swp differ diff --git a/views/layout.jade b/views/layout.jade index 6b367a0..d317d40 100644 --- a/views/layout.jade +++ b/views/layout.jade @@ -14,11 +14,11 @@ html nav.navbar.navbar-default.navbar-fixed-top ul.nav.navbar-nav li(role="presentation" ) - a(href="#home") THSF + a(href="#logo") THSF li(role="presentation") - a(href="#presentation") presentation + a(href="#home") presentation li(role="presentation" ) - a(href="#programme") preogramme + a(href="#programm") programme block body diff --git a/views/view.jade b/views/view.jade index 9a34486..0a0de0e 100644 --- a/views/view.jade +++ b/views/view.jade @@ -1,5 +1,6 @@ include ./layout.jade .container-fluid + #logo each item in torender div(id= item.divId)!= item.html if isAuth