new layout
This commit is contained in:
ang-st
parent
dda6b4f1f4
commit
c95239f106
8
db.js
8
db.js
|
|
@ -66,9 +66,9 @@ exports.loadPage = function (name, callback) {
|
|||
for( var i = 0; i < files.length; i++){
|
||||
//console.log(files[i])
|
||||
try{
|
||||
var html = Markdown(data[i].toString())
|
||||
//console.log(html)
|
||||
fileObj.push({name : files[i], markdown:data[i], html:html} )
|
||||
var html = Markdown(data[i].toString().replace(/\r/g,""))
|
||||
console.log(data[i].toString())
|
||||
fileObj.push({name : files[i], markdown:data[i].toString(), html:html} )
|
||||
}
|
||||
catch (err){ }
|
||||
|
||||
|
|
@ -129,7 +129,7 @@ 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);
|
||||
FS.writeFile(path, value, callback);
|
||||
FS.writeFile(path, value.replace(/\r/g,""), callback);
|
||||
};
|
||||
|
||||
var dbFile = Path.join(__dirname, 'app.db');
|
||||
|
|
|
|||
|
|
@ -1,29 +1,9 @@
|
|||
p(#title_text)=. [THSF] 2015@Toulouse:/less/is/more
|
||||
|
||||
|
||||
h3. Hello THSF
|
||||
|
||||
p(bla). this is a simple and stupid wiki :)
|
||||
|
||||
p(test). it wil blaaa
|
||||
|
||||
Lorem ipsum dolor sit amet, mel brute integre ei. At cibo nullam omnesque eam. Mei ea melius fabellas. Legere salutandi ei cum, aperiam repudiare vulputate ea eam, ei has virtute fabellas instructior. Aeque voluptua convenire at pro. Sale ridens id est, at sit prompta docendi platonem, ex vis utinam dissentiet.
|
||||
|
||||
Mea graece malorum lucilius at. Est quis placerat moderatius ne. Soleat ancillae an has. Sea no tale aeterno quaeque, ei est labores legimus conceptam. Pertinax deseruisse quaerendum sea et, vim option suavitate intellegat ex.
|
||||
|
||||
Facete ancillae molestie ex sit, et possim nonumes aliquando ius, ne assum albucius incorrupte ius. Usu movet solet qualisque no, te sumo laoreet verterem vel, duo id falli splendide forensibus. Ei amet case est. Duo dissentias eloquentiam ut, nam ex eius nemore. Wisi prima rationibus et vim.
|
||||
|
||||
Mollis aliquam disputando ut ius, simul nostrud eligendi quo cu. Mei no modus gubergren, te diceret saperet ius, vis no iudico accusamus. Eam ad case movet, qui sanctus accumsan ut. Ea ignota alienum delicata est. Cum justo appellantur ea, eum ex natum dicta dissentias.
|
||||
|
||||
Et ius nonumy adipisci cotidieque, at has euismod oporteat, pro no praesent consetetur delicatissimi. Vix at odio minimum disputando, vel quas concludaturque eu, per mundi alienum id. Ex lorem vivendo fabellas duo, tamquam disputando eu per. Adolescens accommodare usu te. At magna libris oportere nam, ex usu atqui alienum percipitur. Nec no graeci eirmod concludaturque.
|
||||
|
||||
Te minim adipisci indoctum nec. Detraxit legendos ne vim, cibo labore consetetur et eam, vidit discere vis ad. Usu eu falli latine oportere. Omnium cotidieque mei ne, dicat oportere mediocrem sed id.
|
||||
|
||||
Et eum sonet ponderum adversarium. No discere nominavi menandri his, ut dolor possim nec, ne sed reque corpora assueverit. Eum ad graeco suavitate scriptorem. No pro percipit recusabo, est idque aeque elaboraret id. Ad facer postulant voluptaria vel. Te natum quaerendum mea.
|
||||
|
||||
Discere pertinax temporibus an has, periculis persecuti his ex. Nam ei elit assentior, per augue moderatius consequuntur te. Nam ut aperiri facilis necessitatibus, erat detracto gubergren in vix. Mei ne congue aliquam, denique constituto sit ut.
|
||||
|
||||
Ius in veri ocurreret assueverit, et cum soleat nemore splendide. In vel magna inermis qualisque. Nihil congue maiestatis his an, in adhuc platonem senserit vix, ex pri dico fierent. At vel esse velit, case fastidii ne vim. Eam dicta fabellas pertinacia an.
|
||||
|
||||
Ius at eruditi percipit. Has ei elitr lobortis honestatis, eam solet veniam graecis an, tota suscipiantur id sea. At munere putant quo, mel cu ridens dictas debitis. Erroribus imperdiet in quo. Eam scripta integre facilisis ea, menandri evertitur neglegentur pro ex, per amet quaestio sententiae et.
|
||||
|
||||
|
||||
h3. !</images/bulb.png! THSF
|
||||
|
||||
Issue de la rencontre entre le Tetalab (hackerspace toulousain) et Mix’Art Myrys (collectif d’artistes autogéré à Toulouse), la Toulouse Hacker Space Factory est, depuis 2010, une rencontre autour de conférences, d’ateliers de pratiques et de propositions artistiques, ayant trait aux nouvelles technologies, dans la dynamique des hackerspaces.
|
||||
C’est un événement basé sur la mise en commun de connaissances, un moment festif et convivial tourné vers l’utilisation créative des technologies, leurs appropriations et les enjeux que cela suscite.
|
||||
Il est ouvert à tout-e-s, débutant-e-s ou non, expert-e-s ou intéressé-e-s.
|
||||
C’est un temps de rencontres et d’échanges, qui stimule la réflexion et la recherche dans de nombreux domaines, technologique bien sûr, mais au delà, sociologique, philosophique, artistique...
|
||||
L’équilibre entre propositions artistiques, ateliers de pratiques et discussions techniques permet à chacun de s’y retrouver, de découvrir et de comprendre ce qu’il y a derrière une technologie nouvelle, un produit fini, un univers artistique... tout en se questionnant sur l’impact sociétal que cela peut produire.
|
||||
2015 sera la 6ème édition de cet événement à Toulouse.
|
||||
|
|
|
|||
|
|
@ -0,0 +1,12 @@
|
|||
h3. !</images/globe.png! Conférences
|
||||
|
||||
| Bernard STIEGLER (Philosophe) | | TBA|
|
||||
|Jérémie ZIMMERMAN (cofondateur de la Quadrature du Net) | Droits et libertés sur Internet | TBA |
|
||||
| Philippe LANGLOIS (télécommunications et sécurité sur le net) | LTE et VoLTE Pwns: insécurité à long terme | TBA |
|
||||
| Jérôme HOURDEAUX - FO0 et Grégoire POUGET (Mediapart et RSF) | Hacktivisme et medias | TBA |
|
||||
| Renaud LIFCHITZ ( chercheur opppida.fr ) | L’ordinateur quantique en pratique et ses impacts sur la cryptographie | TBA |
|
||||
| Marc-Olivier KILLIJIAN | Géolocalisation / Geoprivacy | TBA|
|
||||
| Yunohost (https://yunohost.org) | l’Auto Hebergement | TBA |
|
||||
| Lord EPSYLON | BorderCheck - Géolocalisation avec interface type google map | TBA|
|
||||
| Julien BETHENCOURT || TBA |
|
||||
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
h3. bla
|
||||
|
||||
|_. head |_. table |_. row |
|
||||
| a | table | row 11 |
|
||||
| a | table | row 2 |
|
||||
|
||||
|
|
@ -0,0 +1,9 @@
|
|||
h3. !</images/engrenage.png! Atelier
|
||||
|
||||
|_. Sujet |_. par |_. date |_.inscription |
|
||||
| Gifs animées | TTH || |
|
||||
| Gouter Codelab | |||
|
||||
| Sérigraphie | Dirty-Print |||
|
||||
| Initiation Arduino | Philippe Martorell | ||
|
||||
| Auto Hébergement | chouchen et yunohost | ||
|
||||
| DémoScêne | take your SID with you |||
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
h3. 03 test
|
||||
|
||||
render me that
|
||||
|
|
@ -0,0 +1,6 @@
|
|||
h3. Exposition et installation en continue
|
||||
|
||||
| BODY BOUDDHISME | Lévitation Assistée par Ordinateur|
|
||||
| DEMOTRO | Démonstration de vieilles machines |
|
||||
| MAGALIE MARC | Feedback video |
|
||||
| PIERRE GRANGE-PRADERAS | Installation interactive |
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
# 04 programm
|
||||
|
||||
|_. horaire |_. intitulé |_. où |
|
||||
| 8h00 | table | row 1 |
|
||||
| 9h00 | table | row 2 |
|
||||
| 10h00 | ma grand mere fait du ski| dans les highlands |
|
||||
|
|
@ -0,0 +1 @@
|
|||
h3. concert
|
||||
|
|
@ -0,0 +1 @@
|
|||
h3. infos pratiques
|
||||
|
|
@ -0,0 +1 @@
|
|||
h3. contact
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
After Width: | Height: | Size: 5.4 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 7.9 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 13 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 12 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 23 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 2.2 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 144 B |
|
|
@ -1,53 +1,141 @@
|
|||
|
||||
@font-face {
|
||||
font-family: 'Frontage';
|
||||
src: url("/fonts/Frontage-Bold.otf") format("opentype");
|
||||
}
|
||||
|
||||
|
||||
@font-face {
|
||||
font-family: 'Frontage-regular';
|
||||
src: url("/fonts/Frontage-Bold.otf") format("opentype");
|
||||
}
|
||||
|
||||
|
||||
body {
|
||||
padding: 50px;
|
||||
background-image: url(../images/back1.png);
|
||||
background-repeat: no-repeat;
|
||||
background-attachment: fixed;
|
||||
background-color: #000000;
|
||||
font: 14px "Lucida Grande", Helvetica, Arial, sans-serif;
|
||||
padding-top: 120px;
|
||||
background-color: #f1623b;
|
||||
font: 14px "Lucida Grande", Helvetica, Arial, sans-serif;
|
||||
color: #ffffff;
|
||||
margin-left: auto;
|
||||
margin-right: auto;
|
||||
background-image: url(../images/logo1.png) ;
|
||||
background-repeat: no-repeat;
|
||||
background-attachment: fixed;
|
||||
background-position: center top;
|
||||
background-size: contain;
|
||||
background-clip: padding-box;*/
|
||||
/*
|
||||
-webkit-background-size: cover;
|
||||
-moz-background-size: cover;
|
||||
-o-background-size: cover;
|
||||
background-size: cover;
|
||||
*/
|
||||
}
|
||||
@media screen and (max-width: 768px) {
|
||||
body { padding-top: 0px; }
|
||||
}
|
||||
|
||||
a {
|
||||
color: #00B7FF;
|
||||
}
|
||||
|
||||
#title_text{
|
||||
.navbar-fixed-top {
|
||||
font-family: 'Frontage-regular';
|
||||
background-color: #000000;
|
||||
font-size:1vw;
|
||||
border-color: #000000;
|
||||
}
|
||||
|
||||
font-family: "andale mono", "lucida console", monospace;
|
||||
font-size:30px;
|
||||
.navbar-default .navbar-nav>li>a{
|
||||
color:#ffffff;
|
||||
}
|
||||
|
||||
#home {
|
||||
display:block;
|
||||
}
|
||||
.img-logo{
|
||||
padding-top:30%;
|
||||
padding-left:10%;
|
||||
max-width:30px;
|
||||
}
|
||||
/*
|
||||
h3 {
|
||||
background:#ffffff;
|
||||
max-width:15%;
|
||||
transform:rotate(9deg);
|
||||
top:-10%;
|
||||
border-radius:10px;
|
||||
color:#000000;
|
||||
}
|
||||
*/
|
||||
|
||||
table {
|
||||
|
||||
/*a.anchor{display: block; position: relative; top: -10px; visibility: hidden;}*/
|
||||
|
||||
.content_box{
|
||||
background-color: #ffffff;
|
||||
color: #000000;
|
||||
padding: 5%;
|
||||
margin: 3%;
|
||||
padding-top: 30px;
|
||||
margin-bottom:30px;
|
||||
min-width:0%;
|
||||
min-height:0%;
|
||||
border-radius: 25px;
|
||||
opacity: 0.85;
|
||||
}
|
||||
|
||||
.content_box h3 {
|
||||
font-family: 'Frontage';
|
||||
text-align:center
|
||||
}
|
||||
.content_box img {
|
||||
margin:10px;
|
||||
max-width:100px;
|
||||
}
|
||||
.content_box table {
|
||||
/*display: table;*/
|
||||
margin-left: auto;
|
||||
margin-right: auto;
|
||||
min-width:70%;
|
||||
border-collapse : collapse;
|
||||
text-align:center;
|
||||
}
|
||||
table th,
|
||||
table td {
|
||||
.content_box table th,
|
||||
.content_box table td {
|
||||
padding : 4px 8px;
|
||||
border : 1px solid #aaa;
|
||||
}
|
||||
ul {
|
||||
.content_box ul {
|
||||
padding-left: 2em;
|
||||
}
|
||||
|
||||
/*
|
||||
#logo {
|
||||
display: block;
|
||||
margin-top: 50px;
|
||||
margin-bottom: 70px;
|
||||
margin-left: auto;
|
||||
margin-right: auto;
|
||||
width:30%;
|
||||
padding: 20%;
|
||||
width:25%;
|
||||
padding: 15%;
|
||||
background-image: url(../images/logo.png);
|
||||
background-size: contain;
|
||||
filter: invert(100%);
|
||||
-webkit-filter: invert(100%);
|
||||
background-repeat: no-repeat;
|
||||
}
|
||||
*/
|
||||
#title_text{
|
||||
|
||||
font-family: "andale mono", "lucida console", monospace;
|
||||
/*font-size:30px;*/
|
||||
font-size:1vw;
|
||||
color: #fff;
|
||||
opacity:1;
|
||||
padding-left:70%;
|
||||
padding-top:5%;
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -3,22 +3,32 @@ html
|
|||
head
|
||||
title= title
|
||||
link(rel='stylesheet', href='/stylesheets/bootstrap.min.css')
|
||||
|
||||
meta( name="viewport" content="width=device-width, initial-scale=1")
|
||||
//link(rel='stylesheet', href='http://lbesson.bitbucket.org/md/themes/cyborg.min.css')
|
||||
link(rel='stylesheet', href='http://lbesson.bitbucket.org/md/themes/bootstrap-responsive.min.css')
|
||||
link(rel='stylesheet', href='/stylesheets/style.css')
|
||||
script(src='/js/jquery.min.js')
|
||||
script(src='/js/bootstrap.min.js')
|
||||
body
|
||||
nav.navbar.navbar-default.navbar-fixed-top
|
||||
div.container-fluid
|
||||
nav.navbar.navbar-default.navbar-fixed-top
|
||||
ul.nav.navbar-nav
|
||||
li(role="presentation" )
|
||||
a(href="#logo") THSF
|
||||
li(role="presentation")
|
||||
a(href="#home") presentation
|
||||
img(src="/images/logo_small.png" class="img-logo")
|
||||
li(role="presentation" )
|
||||
a(href="#programm") programme
|
||||
|
||||
a(href="#home", class="anchor") presentation
|
||||
li(role="presentation" )
|
||||
a(href="#conference", class="anchor") conférences
|
||||
li(role="presentation" )
|
||||
a(href="#ateliers", class="anchor") ateliers
|
||||
li(role="presentation" )
|
||||
a(href="#install", class="anchor") expositions
|
||||
li(role="presentation" )
|
||||
a(href="#concert", class="anchor") concerts
|
||||
li(role="presentation" )
|
||||
a(href="#infos", class="anchor") infos pratiques
|
||||
li(role="presentation" )
|
||||
a(href="#contact", class="anchor") contact
|
||||
#title_text [THSF] 14-17/05/2015@Toulouse:/less/is/more
|
||||
block body
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
include ./layout.jade
|
||||
.container-fluid
|
||||
div.container-fluid
|
||||
#logo
|
||||
each item in torender
|
||||
div(id= item.divId)!= item.html
|
||||
div(id= item.divId, class="content_box")!= item.html
|
||||
if isAuth
|
||||
a(href="/" + item.name + "/edit")= "Edit this Page"
|
||||
|
|
|
|||
Loading…
Reference in New Issue