From c29296bf83d1e5751b9047af761edc87e71fad2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jes=C3=BAs=20Espino?= <jesus.espino@kaleidos.net>
Date: Mon, 28 Jul 2014 13:10:08 +0200
Subject: [PATCH] Some wiki fixes

---
 app/coffee/modules/common/filters.coffee |  7 +++++++
 app/coffee/utils.coffee                  |  5 +++++
 app/partials/wiki-edit.jade              |  7 ++++---
 app/partials/wiki.jade                   |  9 +++++----
 app/styles/layout/wiki.scss              | 13 ++++++++-----
 5 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/app/coffee/modules/common/filters.coffee b/app/coffee/modules/common/filters.coffee
index b0f632dc..091b8b8f 100644
--- a/app/coffee/modules/common/filters.coffee
+++ b/app/coffee/modules/common/filters.coffee
@@ -19,6 +19,8 @@
 # File: modules/common/filters.coffee
 ###
 
+taiga = @.taiga
+
 module = angular.module("taigaCommon")
 
 defaultFilter = ->
@@ -38,3 +40,8 @@ yesNoFilter = ->
         return "No"
 
 module.filter("yesNo", yesNoFilter)
+
+unslugify = ->
+    return taiga.unslugify
+
+module.filter("unslugify", unslugify)
diff --git a/app/coffee/utils.coffee b/app/coffee/utils.coffee
index 2e88b6d0..a20abc1e 100644
--- a/app/coffee/utils.coffee
+++ b/app/coffee/utils.coffee
@@ -48,6 +48,10 @@ slugify = (data) ->
     return _.str.slugify(data)
 
 
+unslugify = (data) ->
+    return _.str.capitalize(data.replace(/-/g, ' '))
+
+
 toggleText = (element, texts) ->
     nextTextPosition = element.data('nextTextPosition')
     nextTextPosition = 0 if not nextTextPosition? or nextTextPosition >= texts.length
@@ -104,6 +108,7 @@ taiga.bindOnce = bindOnce
 taiga.mixOf = mixOf
 taiga.trim = trim
 taiga.slugify = slugify
+taiga.unslugify = unslugify
 taiga.toggleText = toggleText
 taiga.groupBy = groupBy
 taiga.timeout = timeout
diff --git a/app/partials/wiki-edit.jade b/app/partials/wiki-edit.jade
index b1a1754e..8c8254b7 100644
--- a/app/partials/wiki-edit.jade
+++ b/app/partials/wiki-edit.jade
@@ -8,14 +8,15 @@ block content
                 ng-init="section='wiki'")
         sidebar.menu-secondary.extrabar
             section.wiki-nav(tg-wiki-nav, ng-model="wikiLinks")
-        section.main.backlog
+        section.main.wiki
             //Include views/components/mainTitle
             header
                 h1
                     span(tg-bo-html="project.name")
                     span.green Wiki
-                    span.green(tg-bo-html='wikiSlug')
-                    a.button.button-green.save-wiki(href="", title="Save", ng-click="ctrl.save()") Save
+                    span.wiki-title(tg-bo-html='wikiSlug|unslugify')
+            .action-buttons
+                a.button.button-green.save-wiki(href="", title="Save", ng-click="ctrl.save()") Save
 
             section.wysiwyg
                 textarea(placeholder="Write a your wiki page", ng-model="wiki.content", tg-markitup)
diff --git a/app/partials/wiki.jade b/app/partials/wiki.jade
index 1b5a6f0d..6dfd8316 100644
--- a/app/partials/wiki.jade
+++ b/app/partials/wiki.jade
@@ -8,15 +8,16 @@ block content
                 ng-init="section='wiki'")
         sidebar.menu-secondary.extrabar
             section.wiki-nav(tg-wiki-nav, ng-model="wikiLinks")
-        section.main.backlog
+        section.main.wiki
             //Include views/components/mainTitle
             header
                 h1
                     span(tg-bo-html="project.name")
                     span.green Wiki
-                    span.wiki-title(tg-bo-html='wiki.slug')
-                    a.button.button-red.edit-wiki(href="", title="Delete", ng-click="ctrl.delete()") Delete
-                    a.button.button-green.edit-wiki(href="", title="Edit", ng-click="ctrl.edit()") Edit
+                    span.wiki-title(tg-bo-html='wiki.slug|unslugify')
+            .action-buttons
+                a.button.button-red.delete-wiki(href="", title="Delete", ng-click="ctrl.delete()") Delete
+                a.button.button-green.edit-wiki(href="", title="Edit", ng-click="ctrl.edit()") Edit
 
             include views/modules/wiki-summary
 
diff --git a/app/styles/layout/wiki.scss b/app/styles/layout/wiki.scss
index f1501de6..50930528 100644
--- a/app/styles/layout/wiki.scss
+++ b/app/styles/layout/wiki.scss
@@ -1,9 +1,12 @@
 .wiki-content {
     margin-bottom: 2rem;
 }
-.edit-wiki {
-    float: right;
-}
-.delete-wiki {
-    float: right;
+.action-buttons {
+    position: absolute;
+    top: 2rem;
+    right: 2rem;
+    .delete-wiki, .edit-wiki, .save-wiki {
+        float:right;
+        margin-left: 10px;
+    }
 }