@@ -1,30 +1,65 @@

+

+span.title {

+        color: #777;

+        font-size: 20px;

+        padding: 4px 7px;

+}

+

 input.rounded {

-	border: 1px solid #ccc;

-	-moz-border-radius: 10px;

-	-webkit-border-radius: 10px;

-	border-radius: 10px;

-	-moz-box-shadow: 2px 2px 3px #666;

-	-webkit-box-shadow: 2px 2px 3px #666;

-	box-shadow: 2px 2px 3px #666;

-	font-size: 20px;

-	padding: 4px 7px;

-	outline: 0;

-	-webkit-appearance: none;

-}

-input.rounded:focus {

-	border-color: #339933;

+        border: 1px solid #ccc;

+}

+

+input.roundedtext {

+        border: 0px solid #ccc;

 }

+

+input.rounded, input.roundedtext {

+        -moz-border-radius: 10px;

+        -webkit-border-radius: 10px;

+        border-radius: 10px;

+        font-size: 20px;

+        padding: 4px 7px;

+        outline: 0;

+        -webkit-appearance: none;

+}

+

+input.rounded:focus, input.roundedtext:focus, #wysihtml5-editor:focus {

+        border: 1px solid #ccc;

+        border-color: #339933;

+        -moz-box-shadow: 0px 0px 4px 1px rgba(0,0,0,0.3);

+        -webkit-box-shadow: 0px 0px 4px 1px rgba(0,0,0,0.3);

+        box-shadow: 0px 0px 4px 1px rgba(0,0,0,0.3);

+}

+

+input.roundedtext {

+        width: 795px;

+        margin: 10px 0px 20px;

+        float: right

+}

+

+

 div.buttondiv {

-	text-align: center;

-	width: 650px;

-	margin-left: auto;

-	margin-right: auto;

-	margin-top: 10px;

+        text-align: center;

+        width: 650px;

+        margin-left: auto;

+        margin-right: auto;

+        margin-top: 10px;

 }

 span.buttonspan {

-	margin-left: auto;

-	margin-right: 0px;

+        margin-left: auto;

+        margin-right: 0px;

+}

+

+div.titlediv {

+        width: 810px;

+        margin-left: auto;

+        margin-right: auto;

+        margin-top: 10px;

+}

+

+#wysihtml5-editor {

+        margin-top: 30px;

 }

@@ -53,21 +53,26 @@

         <a data-wysihtml5-dialog-action="save">OK</a>&nbsp;<a data-wysihtml5-dialog-action="cancel">Cancel</a>

       </div>

     </div>

-    

+

     <section>

       <textarea id="wysihtml5-editor" spellcheck="false" wrap="off" autofocus placeholder="Escribe aquí ...">

       </textarea>

     </section>

     <div class='buttondiv'>

-	<span class='buttonspan'><input class='rounded' id='donewpost' type ='button' value='Enviar'/></span>

+        <span class='buttonspan'><input class='rounded' id='donewpost' type ='button' value='Enviar'/></span>

+    </div>

+

+    <div class='titlediv'>

+    <p><input id="title" class="roundedtext" placeholder="T&iacute;tulo"></input></p>

     </div>

+

     <script>

       var editor = new wysihtml5.Editor("wysihtml5-editor", {

         toolbar:     "wysihtml5-editor-toolbar",

         stylesheets: ["wysihtml5/reset-min.css", "wysihtml5/wysihtml5-editor.css"],

         parserRules: wysihtml5ParserRules

       });

-      

+

       editor.on("load", function() {

         var composer = editor.composer,

             h1 = editor.composer.element.querySelector("h1");

@@ -2,24 +2,31 @@

 "use strict";

 function request(querytext, func, errorfunc) {

-	var req = new XMLHttpRequest();

-	req.onreadystatechange = function() {

-		if (req.readyState !== 4) {

-			return;

-		}

-		if (req.status !== 200) {

-			errorfunc();

-			return;

-		}

-		func(req.responseText);

-	};

-	req.open("GET",querytext);

-	req.send();

+        var req = new XMLHttpRequest();

+        req.onreadystatechange = function() {

+                if (req.readyState !== 4) {

+                        return;

+                }

+                if (req.status !== 200) {

+                        errorfunc();

+                        return;

+                }

+                func(req.responseText);

+        };

+        req.open("GET",querytext);

+        req.send();

 }

 donewpost.onclick = function(e) {

-	request("/newpost"+window.location.search+"&t="+encodeURIComponent(document.getElementById("wysihtml5-editor").value),function(r) {

-		window.location="/posts.html"+window.location.search;},function() {});

+        var requri=[];

+        requri.push("/newpost");

+        requri.push(window.location.search);

+        requri.push("&h=");

+        requri.push(encodeURIComponent(document.getElementById("title").value));

+        requri.push("&t=");

+        requri.push(encodeURIComponent(document.getElementById("wysihtml5-editor").value));

+        request(requri.join(""),function(r) {

+                window.location="/posts.html"+window.location.search;},function() {});

 };

 }());

@@ -81,11 +81,6 @@ div.centeredbutton {

         margin-right: auto;

 }

-p.title {

-        font-size: 28px;

-        padding: 0px 0px 20px 0px;

-}

-

 .aligned {

         list-style-type: none;

         padding-left: 30px;

@@ -102,23 +97,30 @@ div.post {

         width: 800px;

         margin-left: auto;

         margin-right: auto;

-	margin-top: 35px;

-	margin-bottom: 20px;

-	background: #f4f4f4;

+        margin-top: 35px;

+        margin-bottom: 20px;

+        background: #f4f4f4;

         -moz-box-shadow: 0px 0px 1px #aaa;

         -webkit-box-shadow: 0px 0px 1px #aaa;

         box-shadow: 0px 0px 1px #aaa;

 }

 div.postheader {

-        border: 1px solid #ddd;

-        padding: 4px;

-        margin-left: 0px;

-        margin-right: 0px;

-	background: #eee;

-        -moz-box-shadow: 0px 0px 1px #eee;

-        -webkit-box-shadow: 0px 0px 1px #eee;

-        box-shadow: 0px 0px 1px #eee;

+        border-style: none none solid none;

+        border-bottom: 1px solid #ddd;

+        margin-bottom: 10px;

+        padding-bottom: 10px;

+}

+

+p.title {

+        margin-top: 0px;

+}

+

+span.title {

+        font-size: 20px;

+        padding: 0px;

+        margin-top: 0px;

+        margin-bottom: 20px;

 }

 p.authorpostnum, p.date {

@@ -128,11 +130,12 @@ p.authorpostnum, p.date {

 }

 span.author {

-	float: left;

+/*        float: left;*/

+        font-weight: bold;

 }

 span.postnum {

-	float: right;

+        float: right;

 }

 div.postbody {

@@ -32,11 +32,24 @@ function changepost(postnum,data) {

         var p=JSON.parse(data);

         var postdate=new Date(0);

         postdate.setUTCSeconds(parseInt(p.date));

-        var header="";

-        var body="";

-        header='<div class="postheader"><p class="authorpostnum">&nbsp;<span class="author">Autor: '+p.author+'</span><span class="postnum">#'+postnum+'</span></p><p class="date">Fecha: '+postdate.toString()+'</p></div>';

-        body='<div class="postbody">'+decodeURIComponent(p.text)+'</div>';

-        postsarray[toppost-postnum]='<div class="post">'+header+body+'</div>' /*+JSON.stringify(p) */;

+        var header=[];

+        var body=[];

+        header.push('<div class="postheader">');

+        header.push('<p class="title"><span class="title">');

+        header.push(decodeURIComponent(p.title));

+        header.push('</span><span class="postnum">#');

+        header.push(postnum);

+        header.push('</span></p>');

+        header.push('<p class="authorpostnum">Por <span class="author">');

+        header.push(p.author);

+        header.push('</span> el <span class="date">');

+        header.push(postdate.toString());

+        header.push('</span></p>');

+        header.push('</div>')

+        body.push('<div class="postbody">');

+        body.push(decodeURIComponent(p.text));

+        body.push('</div>');

+        postsarray[toppost-postnum]='<div class="post">'+header.join("")+body.join("")+'</div>' /*+JSON.stringify(p) */;

 }

 function clearpost(postnum) {

@@ -372,11 +372,14 @@ http_getpost(wk *web, int connid, wk_uri *uri, void *userptr,char *user)

 wk_action

 http_newpost(wk *web, int connid, wk_uri *uri, void *userptr,char *user)

 {

+        char h[8192];

         char t[8192];

         kakumei *ka=(kakumei *)userptr;

+        if(wk_uri_copyvar(uri,"h",h,sizeof(h))==NULL)

+                h[0]='\0';

         if(wk_uri_copyvar(uri,"t",t,sizeof(t))==NULL)

                 t[0]='\0';

-        if(t[0]=='\0' || post_new(ka,user,t)!=0) {

+        if((t[0]=='\0' && h[0]=='\0') || post_new(ka,user,h,t)!=0) {

                 wk_serve_error(web,connid,wkerr_internal);

                 log_write("NEWP","invalid post, send error");

                 return(wkact_finished);

@@ -22,7 +22,7 @@

 #define MAXPOSTS 2000000

 int

-post_new(kakumei *ka, char *user, char *text)

+post_new(kakumei *ka, char *user, char *title, char *text)

 {

         int last;

         int num;

@@ -31,9 +31,9 @@ post_new(kakumei *ka, char *user, char *text)

         FILE *f;

         struct stat st;

         if(ka==NULL || user==NULL || user[0]=='\0' || text==NULL || text[0]=='\0') {

-		log_write("POST","sanity check error\n");

+                log_write("POST","sanity check error\n");

                 return(-1);

-	}

+        }

         last=post_last(ka);

         filename[0]='\0';

         for(num=last+1;num<MAXPOSTS;num++) {

@@ -43,9 +43,9 @@ post_new(kakumei *ka, char *user, char *text)

                         break; /* this one is ok: file doesn't exist */

         }

         if(filename[0]=='\0' || num>=MAXPOSTS) {

-		log_write("POST","couldn't generate filename or too many posts\n");

+                log_write("POST","couldn't generate filename or too many posts\n");

                 return(-1);

-	}

+        }

         /* create dir structure */

         mkdir(DATADIR,0700);

         mkdir(POSTSDIR,0700);

@@ -54,11 +54,12 @@ post_new(kakumei *ka, char *user, char *text)

         mkdir(dirname,0700);

         /* save the new post */

         if((f=fopen(filename,"w"))==NULL) {

-		log_write("POST","couldn't save post\n");

+                log_write("POST","couldn't save post\n");

                 return(-1);

-	}

+        }

         fprintf(f,"{\n  \"author\":\"%s\",\n",user);

         fprintf(f,"  \"date\":%li,\n",(long)time(NULL));

+        fprintf(f,"  \"title\":\"%s\",\n",title);

         fprintf(f,"  \"text\":\"%s\",\n",text);

         fprintf(f,"  \"comments\":[\n]}\n");

         fclose(f),f=NULL;

@@ -81,9 +82,9 @@ post_last(kakumei *ka)

         snprintf(filename,sizeof(filename)-1,"%s/%s",POSTSDIR,"last");

         filename[sizeof(filename)-1]='\0';

         if((fd=open(filename,O_RDONLY))==-1) {

-		log_write("POST","couldn't get last post number\n");

+                log_write("POST","couldn't get last post number\n");

                 return(-1);

-	}

+        }

         memset(readbuf,0,sizeof(readbuf));

         read(fd,readbuf,sizeof(readbuf)-1);

         close(fd),fd=-1;

@@ -95,15 +96,15 @@ post_get(kakumei *ka, int num, char *filename, int filenamesize)

 {

         struct stat st;

         if(ka==NULL || num<0 || filename==NULL || filenamesize<=0) {

-		log_write("POST","Sanity check error\n");

+                log_write("POST","Sanity check error\n");

                 return(-1);

-	}

+        }

         snprintf(filename,filenamesize,"%s/%04i/%04i.json",POSTSDIR,num/10000,num%10000);

         filename[filenamesize-1]='\0';

         if(stat(filename,&st)!=0) {

-		log_write("POST","Post file doesn't exist\n");

+                log_write("POST","Post file doesn't exist\n");

                 return(-1); /* file doesn't exist */

-	}

+        }

         return(0);

 }

@@ -114,19 +115,19 @@ post_addcomment(kakumei *ka, int postnum, char *user, char *text)

         char buf[16];

         FILE *f;

         if(ka==NULL || postnum<0 || user==NULL || text==NULL) {

-		log_write("POST","Sanity check error\n");

+                log_write("POST","Sanity check error\n");

                 return(-1);

-	}

-        if(post_get(ka,postnum,filename,sizeof(filename))!=0) 

+        }

+        if(post_get(ka,postnum,filename,sizeof(filename))!=0)

                 return(-1);

         if((f=fopen(filename,"r+"))==NULL) {

-		log_write("POST","Couldn't open post file fot appending\n");

+                log_write("POST","Couldn't open post file fot appending\n");

                 return(-1);

-	}

+        }

         fseek(f,-2,SEEK_END);

         if(fread(buf,1,2,f)!=2 || buf[0]!=']' ||  buf[1]!='}') {

                 fclose(f),f=NULL;

-		log_write("POST","Post file contents are corrupted\n");

+                log_write("POST","Post file contents are corrupted\n");

                 return(-1);

         }

         fseek(f,-2,SEEK_END);

@@ -11,7 +11,7 @@

 #include "kakumei.h"

-int post_new(kakumei *ka, char *user, char *text);

+int post_new(kakumei *ka, char *user, char *title, char *text);

 int post_last(kakumei *ka);

 int post_get(kakumei *ka, int postnum, char *filename, int filenamesize);

 int post_addcomment(kakumei *ka, int postnum, char *user, char *text);