From 0d54fc2ec3c4b69e630d0ba0a7f96063fd5851be Mon Sep 17 00:00:00 2001
From: "Daniel J. Summers" <daniel.summers.2415@gmail.com>
Date: Fri, 11 Nov 2016 14:44:09 -0600
Subject: [PATCH] Admin tweaks plus

- Version now reports the correct version
- Post edit properly renders existing selected categories as checked,
and uses the description in the title attribute if it is present
- Created light/dark transparent logos

Ready to test the functionality of the admin area next...
---
 src/MyWebLog.App/App.fs                       |   2 +-
 src/MyWebLog.App/AssemblyInfo.fs              |   4 +-
 src/MyWebLog.App/PostModule.fs                |  31 +++++----
 src/MyWebLog.App/ViewModels.fs                |  59 +++++++++++++-----
 src/MyWebLog.Data.RethinkDB/Post.fs           |   8 ++-
 src/MyWebLog/content/logo-dark.png            | Bin 0 -> 3362 bytes
 src/MyWebLog/content/logo-light.png           | Bin 0 -> 4135 bytes
 src/MyWebLog/project.json                     |   2 +-
 .../views/admin/content}/tinymce-init.js      |   0
 src/myWebLog/content/styles/admin.css         |   5 --
 src/myWebLog/views/admin/admin-layout.html    |   2 +-
 src/myWebLog/views/admin/content/logo.png     | Bin 5017 -> 0 bytes
 src/myWebLog/views/admin/dashboard.html       |   9 ++-
 src/myWebLog/views/admin/page/edit.html       |   4 +-
 src/myWebLog/views/admin/post/edit.html       |  18 ++----
 .../themes/default/content/footer-logo.png    | Bin 2257 -> 0 bytes
 src/myWebLog/views/themes/default/footer.html |   2 +-
 17 files changed, 81 insertions(+), 65 deletions(-)
 create mode 100644 src/MyWebLog/content/logo-dark.png
 create mode 100644 src/MyWebLog/content/logo-light.png
 rename src/{myWebLog/content/scripts => MyWebLog/views/admin/content}/tinymce-init.js (100%)
 delete mode 100644 src/myWebLog/content/styles/admin.css
 delete mode 100644 src/myWebLog/views/admin/content/logo.png
 delete mode 100644 src/myWebLog/views/themes/default/content/footer-logo.png

diff --git a/src/MyWebLog.App/App.fs b/src/MyWebLog.App/App.fs
index 4454307..5eba1cc 100644
--- a/src/MyWebLog.App/App.fs
+++ b/src/MyWebLog.App/App.fs
@@ -130,7 +130,7 @@ type MyWebLogBootstrapper() =
 
 
 let version = 
-  let v = typeof<AppConfig>.GetType().GetTypeInfo().Assembly.GetName().Version
+  let v = typeof<AppConfig>.GetTypeInfo().Assembly.GetName().Version
   match v.Build with
   | 0 -> match v.Minor with 0 -> string v.Major | _ -> sprintf "%d.%d" v.Major v.Minor
   | _ -> sprintf "%d.%d.%d" v.Major v.Minor v.Build
diff --git a/src/MyWebLog.App/AssemblyInfo.fs b/src/MyWebLog.App/AssemblyInfo.fs
index 24c3209..0fb972b 100644
--- a/src/MyWebLog.App/AssemblyInfo.fs
+++ b/src/MyWebLog.App/AssemblyInfo.fs
@@ -1,4 +1,4 @@
-namespace myWebLog.Web.AssemblyInfo
+namespace MyWebLog.AssemblyInfo
 
 open System.Reflection
 open System.Runtime.CompilerServices
@@ -14,7 +14,7 @@ open System.Runtime.InteropServices
 [<assembly: AssemblyCulture("")>]
 [<assembly: ComVisible(false)>]
 [<assembly: Guid("e6ee110a-27a6-4a19-b0cb-d24f48f71b53")>]
-[<assembly: AssemblyVersion("0.9.1.0")>]
+[<assembly: AssemblyVersion("0.9.2.0")>]
 [<assembly: AssemblyFileVersion("1.0.0.0")>]
 
 do
diff --git a/src/MyWebLog.App/PostModule.fs b/src/MyWebLog.App/PostModule.fs
index 531e660..0a241e2 100644
--- a/src/MyWebLog.App/PostModule.fs
+++ b/src/MyWebLog.App/PostModule.fs
@@ -103,18 +103,18 @@ type PostModule(data : IMyWebLogData, clock : IClock) as this =
     upcast this.Response.FromStream(stream, sprintf "application/%s+xml" format) *)
 
   do
-    this.Get  ("/",                                fun _     -> this.HomePage ())
-    this.Get  ("/{permalink*}",                    fun parms -> this.CatchAll (downcast parms))
-    this.Get  ("/posts/page/{page:int}",           fun parms -> this.PublishedPostsPage (getPage <| downcast parms))
-    this.Get  ("/category/{slug}",                 fun parms -> this.CategorizedPosts (downcast parms))
-    this.Get  ("/category/{slug}/page/{page:int}", fun parms -> this.CategorizedPosts (downcast parms))
-    this.Get  ("/tag/{tag}",                       fun parms -> this.TaggedPosts (downcast parms))
-    this.Get  ("/tag/{tag}/page/{page:int}",       fun parms -> this.TaggedPosts (downcast parms))
-    this.Get  ("/feed",                            fun _     -> this.Feed ())
-    this.Get  ("/posts/list",                      fun _     -> this.PostList 1)
-    this.Get  ("/posts/list/page/{page:int}",      fun parms -> this.PostList (getPage <| downcast parms))
-    this.Get  ("/post/{postId}/edit",              fun parms -> this.EditPost (downcast parms))
-    this.Post ("/post/{postId}/edit",              fun parms -> this.SavePost (downcast parms))
+    this.Get  ("/",                                fun _ -> this.HomePage ())
+    this.Get  ("/{permalink*}",                    fun p -> this.CatchAll (downcast p))
+    this.Get  ("/posts/page/{page:int}",           fun p -> this.PublishedPostsPage (getPage <| downcast p))
+    this.Get  ("/category/{slug}",                 fun p -> this.CategorizedPosts (downcast p))
+    this.Get  ("/category/{slug}/page/{page:int}", fun p -> this.CategorizedPosts (downcast p))
+    this.Get  ("/tag/{tag}",                       fun p -> this.TaggedPosts (downcast p))
+    this.Get  ("/tag/{tag}/page/{page:int}",       fun p -> this.TaggedPosts (downcast p))
+    this.Get  ("/feed",                            fun _ -> this.Feed ())
+    this.Get  ("/posts/list",                      fun _ -> this.PostList 1)
+    this.Get  ("/posts/list/page/{page:int}",      fun p -> this.PostList (getPage <| downcast p))
+    this.Get  ("/post/{postId}/edit",              fun p -> this.EditPost (downcast p))
+    this.Post ("/post/{postId}/edit",              fun p -> this.SavePost (downcast p))
 
   // ---- Display posts to users ----
 
@@ -253,11 +253,10 @@ type PostModule(data : IMyWebLogData, clock : IClock) as this =
                   | None   -> Revision.Empty
         let model = EditPostModel (this.Context, this.WebLog, post, rev)
         model.Categories <- findAllCategories data this.WebLog.Id
-                            |> List.map (fun cat -> string (fst cat).Id,
-                                                    sprintf "%s%s" (String.replicate (snd cat) " &nbsp; &nbsp; ")
-                                                            (fst cat).Name)
+                            |> List.map (fun cat ->
+                                DisplayCategory.Create cat (post.CategoryIds |> List.contains (fst cat).Id)) 
         model.PageTitle  <- Strings.get <| match post.Id with "new" -> "AddNewPost" | _ -> "EditPost"
-        upcast this.View.["admin/post/edit"]
+        upcast this.View.["admin/post/edit", model]
     | _ -> this.NotFound ()
 
   /// Save a post
diff --git a/src/MyWebLog.App/ViewModels.fs b/src/MyWebLog.App/ViewModels.fs
index 65c8252..675d9e4 100644
--- a/src/MyWebLog.App/ViewModels.fs
+++ b/src/MyWebLog.App/ViewModels.fs
@@ -9,7 +9,7 @@ open Newtonsoft.Json
 open NodaTime
 open NodaTime.Text
 open System
-
+open System.Net
 
 /// Levels for a user message
 [<RequireQualifiedAccess>]
@@ -90,7 +90,7 @@ module FormatDateTime =
   
 
 /// Parent view model for all myWebLog views
-type MyWebLogModel (ctx : NancyContext, webLog : WebLog) =
+type MyWebLogModel (ctx : NancyContext, webLog : WebLog) as this =
   
   /// Get the messages from the session
   let getMessages () =
@@ -100,6 +100,20 @@ type MyWebLogModel (ctx : NancyContext, webLog : WebLog) =
     | _ -> ctx.Request.Session.Delete Keys.Messages
     msg
 
+  /// Generate a footer logo with the given scheme
+  let footerLogo scheme =
+    seq {
+      yield sprintf "<img src=\"/content/logo-%s.png\" alt=\"myWebLog\" title=\"" scheme
+      yield sprintf "%s %s &bull; " (Strings.get "PoweredBy") this.Generator
+      yield Strings.get "LoadedIn"
+      yield " "
+      yield TimeSpan(System.DateTime.Now.Ticks - this.RequestStart).TotalSeconds.ToString "f3"
+      yield " "
+      yield (Strings.get "Seconds").ToLower ()
+      yield "\" height=\"30\" />"
+      }
+    |> Seq.reduce (+)
+
   /// The web log for this request
   member this.WebLog = webLog
   /// The subtitle for the webLog (SSVE can't do IsSome that deep)
@@ -134,19 +148,11 @@ type MyWebLogModel (ctx : NancyContext, webLog : WebLog) =
         | None -> this.WebLog.Name
     | pt -> sprintf "%s | %s" pt this.WebLog.Name
 
-  /// An image with the version and load time in the tool tip
-  member this.FooterLogo =
-    seq {
-      yield "<img src=\"/default/footer-logo.png\" alt=\"myWebLog\" title=\""
-      yield sprintf "%s %s &bull; " (Strings.get "PoweredBy") this.Generator
-      yield Strings.get "LoadedIn"
-      yield " "
-      yield TimeSpan(System.DateTime.Now.Ticks - this.RequestStart).TotalSeconds.ToString "f3"
-      yield " "
-      yield (Strings.get "Seconds").ToLower ()
-      yield "\" />"
-      }
-    |> Seq.reduce (+)
+  /// An image with the version and load time in the tool tip (using light text)
+  member this.FooterLogoLight = footerLogo "light"
+ 
+  /// An image with the version and load time in the tool tip (using dark text)
+  member this.FooterLogoDark = footerLogo "dark"
  
 
 // ---- Admin models ----
@@ -399,6 +405,27 @@ type EditPostForm () =
     this.Text   <- rev.Text
     this
 
+/// Category information for display
+type DisplayCategory = {
+  Id : string
+  Indent : string
+  Name : string
+  Description : string
+  IsChecked : bool
+  } 
+with
+  /// Create a display category
+  static member Create (cat : Category, indent) isChecked =
+    { Id          = cat.Id
+      Indent      = String.replicate indent " &nbsp; &nbsp; "
+      Name        = WebUtility.HtmlEncode cat.Name
+      IsChecked   = isChecked
+      Description = WebUtility.HtmlEncode (match cat.Description with Some d -> d | _ -> cat.Name)
+    }
+  /// The "checked" attribute for this category
+  member this.CheckedAttr
+    with get() = match this.IsChecked with true -> "checked=\"checked\"" | _ -> ""
+
 /// View model for the edit post page
 type EditPostModel (ctx, webLog, post, revision) =
   inherit MyWebLogModel (ctx, webLog)
@@ -408,7 +435,7 @@ type EditPostModel (ctx, webLog, post, revision) =
   /// The post being edited
   member val Post = post with get, set
   /// The categories to which the post may be assigned
-  member val Categories : (string * string) list = [] with get, set
+  member val Categories : DisplayCategory list = [] with get, set
   /// Whether the post is currently published
   member this.IsPublished = PostStatus.Published = this.Post.Status
   /// The published date
diff --git a/src/MyWebLog.Data.RethinkDB/Post.fs b/src/MyWebLog.Data.RethinkDB/Post.fs
index da4f62a..9eb5eaa 100644
--- a/src/MyWebLog.Data.RethinkDB/Post.fs
+++ b/src/MyWebLog.Data.RethinkDB/Post.fs
@@ -100,9 +100,13 @@ let tryFindPost conn webLogId postId : Post option =
     let! p =
       r.Table(Table.Post)
         .Get(postId)
-        .Filter(ReqlFunction1 (fun p -> upcast p.["WebLogId"].Eq webLogId))
         .RunAtomAsync<Post> conn
-    return match box p with null -> None | post -> Some <| unbox post
+    return
+      match box p with
+      | null -> None
+      | pst ->
+          let post : Post = unbox pst
+          match post.WebLogId = webLogId with true -> Some post | _ -> None
     }
   |> Async.RunSynchronously
 
diff --git a/src/MyWebLog/content/logo-dark.png b/src/MyWebLog/content/logo-dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..19bdcca2af3095d7f18345a28fbf9c6da0363daa
GIT binary patch
literal 3362
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

literal 0
HcmV?d00001

diff --git a/src/MyWebLog/content/logo-light.png b/src/MyWebLog/content/logo-light.png
new file mode 100644
index 0000000000000000000000000000000000000000..c2d3357fae1b842fc92a60c595f71ce0fba6f07a
GIT binary patch
literal 4135
zcmV+?5ZLdDP)<h;3K|Lk000e1NJLTq006T9001)x1^@s6+@v`x00006VoOIv00000
z008+zyMF)x010qNS#tmY3ljhU3ljkVnw%H_000McNliru;0p^B8X^QEx1j(403B&m
zSad^gZEa<4bN~PV002XBWnpw>WFU8GbZ8()Nlj2>E@cM*01t~vL_t(|+U=ZsbXC=z
z$3Oern-~HFP@qszX~72yB0h==Dk_4nSuQ%l@?FWjI`uJjX)EoFikVWzQk>3=Gu75Y
zfGJ`PKI&t@I>^I<FQWJ$up-*Vsv$xW67GfM-h1|M&mWu{HrM+&5mE!5?^>*|&)&b^
zIeYK#`R(8S?ccc&AV7cs0RjXF5a8<s<3U6|4MxKsoP+t{MdSl((r0x>)^**BEZNPS
zk=0tyuw=IcFGxV<1A!N;|6kmxjyuj}>HjOGPH1m$KgO@DQtBeBxGb=V0htekWwyzD
zYAhD(-wE-{>_Smd(PTeDpM3I32{7JzhJefg_8&DhHAN!Ql3qTw*4OxvOC%D<nGA@?
z(>~pkiI&VRkK6}^OAz?s-QPM_S(CKLr_Xz*B~$PHZLO}Z4*R&@&n?*(4krIL@R_^+
zrp6}Jq>73P<-_N_)RWx}yzX5q8$EjTSw3z#(Yp8Yz?=j)V2H(H{Y6BltxhtTJSAWI
z#>U28B9ibd)GDp@y_UtAUEp3v*!OC0Z~s<cnFGswz|gyQ@5Z!s1qg*gd7~PA`}Vy^
zDOK!E?g|lE={F)$T3UL6Qp)jUYfDN>{t}pzfXrRyYAB`h64DOIX|0#7Tet2FW6Tck
z(wKNWJ|K^KGSMpLjbg;(@c~-vdqiZNh-?#)q=<YjB5SnPGn$*5%R1Z7_V)InA~IJ*
zHi}40L|R4U9TAz;$w<xt!S3C=2WzeG6_GU}QZFJ25!oRkn?&T{R4R35XLY)+dx?lF
z5s|-$NSlak7m-)A*5y@IRn8&5!X%T)QC0_&O-)U`^K9TgOK<$r{<Vnw-inA^mq+%`
z>2|K`UX*8pd6S5=nmiDZ?XK%y;MXN^UH3{6*_B6Mlk2+Y|1I2%ii!%QwZ2b8+Drk6
z$m0zS4W)&2HZ?W%7Ln%*=vrQ1U*F@9kIINhokg@Oa*%$EH4v2+`EIbTFV0~VziqXN
z*VWY>mg6~oX0;O$c}YYnwAOcu$S*`>qy6HgQmL_pi08WQBu`gTM4r)F-=np@TSOL$
z$WA*{m`o-|b~Twr<gpBry&)nGXsz!Oky#?LN<_q}U$<q;mf~Fcwrtr_EF$Zy_F6<<
z6p{P2);|=HM@6LBtDE<AAoH)RPClH&V%}>J{z}Uw7?>V>5&1k@L_}+Sv!(yJ9Qv=e
z+I)~qCdcHkYIj-fYSYVS4&t?l$W{^AoJb^&&$iTy$eULCSG$tTTI(NKdYWC=y(C+^
zR4O%2L_W9L&dD=(Kea=psZ{EW%r>p9t^Gvgj~Oq~ev&!D<wU3?N+VHj>Mmq<UH4+E
zlON?6wAZ})R7*=spNzWoY57ztby^nLrIsu5{mlCM`uZN}$rF)nyLa#YW`UQlGT%y)
zF=>tY^u^=x0V1;9dj7FpL1vFoJ3Sq4DwWC`%1otFXNZXFwcj0!#g53Kvn@R@$z*bL
zE`1FR4W%No$$vk}8ApT#M0uYmTe+S+{?1fNyz9pLCzNyCelxM0<A|`DC{2_zIA^<?
z=|O~F5Fti{7nw@WbX8ql-C-gUPj@ttNF19hgeM|v@>vJ1^*wf7RaKQEB8^r^?wEX*
zTWftwp)RLVsWYrec_bg1wbpm}SeYs;eGha6nYGqGuyp*^=Zd-5>c_2Fblzs^eALG?
zT$QUIjzy?mM45x)6%;oDBY{DLIi4t2(TBf!*OM69(i?mnY~N8)&I}@aN`!y&(N{$|
zQ5>pKoCh3^p(MwOa0;6DQQVE97mCUB=InI!(4j*Uz>0J^91dTc5mvj{3ac&4GDyp;
zsKq{c8dIiB8Kaas!js)pQd079mPp4XX~M+g@!uEf_>LVrHd)2IvGGJA@q~{_w)=Ei
zSFC<YsSB<9E%Hg`DocKR7M&BUwo3}>YinzJIe%!boRd*(24<jW!|+*0ix9Jb$AJOB
zA8<Ji*gIL8qXD>q!-=p0hdC&YL~$3_F(~I#UCj|hScAiFfj!X&!&@w1-`MR`iYR9$
ziZ@UU%Xs>oenWIhsmpRqJOIx;^URyZm?p1ymK{2C9LG<V+!*gZs;sQ6xzH|uz<>d9
zOZJF7e(uiF($dcgP4cc?yK1fC;4bp!PWGNjH#9U<`w>W`Qg2(u;aQrTk~RX(&CTlz
z>3i_O2OIN~S@Am*LxA65I4WbpE&~jP8O&n}3;7sjSz`y6sr00XWhl-7k{xwn`eeOp
zlxg&2Gm3LEY989BbR*xOjCDBt3y`@RZl;xu85Zn+jWNb6PDn=_R<B+i0w#Nd_Gxi(
z@%x#NG;P{60bcS587?a;o0u)WEF!s%um|i1NqXd|i}_LT;fEjYvWmUBh|K9&cI#0`
z9o6nfps}&hCSSii<F<3)z=6Abgau8mx^Rd6HOyf?KOxE}40f#5Ak3zcx!FwzamsiZ
z7=_DN!aNIn+tXg0g~$tm?_pSrvIt;U%T5+sZp9raW&vfuCm5EX7)d&H)9@Ti*_Gi+
zY!#8Wfzy;yr9*}cIR{uVZrr%Dl~U<}T%N}YE>lWf?OEf=z|&q<+&Hg3R$E*9rySxT
zuT9(-b6+P(65C&v4Ie(dr@bfaA~F|stjGTSY@2-9<kBx*`~E)M9x~5oq_?E^1eT&a
zOJUf8;@4F2%M7{RmStXv!NG7Q3)x7Ny(dw^P~iQJ&70=u9+CeKcoi!z7{lExMYxG$
z5$;EEErvSaId<}W;-ol|Myvf>Ir{WM+Gq3#xgrz_U20j@WqJIuKbDr3isxHT1{gee
z@HtAUv>*TSNhh6@%H;+FgMgB!o_gvb&(a?V_&TL6EiFCTDsJy0GB<mD>{ne~9X|c^
z)7?S>0|ySYPbQnP1!I6dp3y3Zd<SCt4pbSH!0{Ggu4djBhzw>QAFmk294b9>8OsF`
zwgNDn5eP4$xC7Y0d?ukh>%B*2CBg<G+=gL;N911t6PeHTEM*sinP|O4h8VxeVF{kM
ziWgh162_QhOH0d&T!Yc8SFi0rwdYzKlSm{+IF4gy$>lr3{vhq5Oqnv}KyJVe_uQns
z2!%r5v5FhIh|C>*96fsU7(W8V#l`mK_Ps1kwt6~yBoc|?h4ht`m7P$S%+r~KVwy#;
zXa_;R7=uVyrA4$dv!g~?Z(o?>iEsxF8-a5%ET@h0yxMV=j$;T@i{igA)FDKe&p$Gs
zkF0xMV?EnzEG4UjoIQK?+s2rBZ-7Q7lgW`vsZn0_+W!6f7g~asTM>~9fR5dEGMUVm
z^7)EItnVGb2*P3G$B#ePN4x8+)n`o?k$F{T`{+2%H0!yt8ItwZc>leRm-foSWOnxE
z>0-E@`OMFwbA88B?{EuCkq$}2YgW6(DE<?L0xB>}<1x=aG?u@+CrU9G!$a)kbSkL?
z%s!D1un!h~Q(%Lz%o?EEeOlJEWnXR)<ZR$nPxk#DJ$mGf&nA<}g~pilINVg|K%rB9
zhU3i2XPsTw{kwFC%NSGt&O7gP$){Y&WO9KqChc0>oJyrmFVOx}*kgo@F@LSCt$i*_
z=<XS7ynmQ4Vahu@xYf_W#gDv$kd+17-oQ7Bu$k$M$Py2}FXLck6H!KGx!*XV)DhuB
zqWn0kuDxylsY73cS|*Tp*>zp_3M;U_)jCKSQK)O)0m=6C$(x_!SZiV)wU42-)>q~F
zSYY+))gjk)CyU6c9GlTEB<wUcHulQW*Ng1@46Su}o(=AP9|McXFYS}bTnSgHRO(E7
z?6ua@a*czC)LJ^<%y!zDOeRNpnRK7!>W8vOI1G3d&4n!7H{{jXm639Og5n1#-bHgQ
z3uxRglMvwv%LV!=^SD1>^KIL<_3Yojf0I(`Fl!>~9LM>V&k0+sl)5&<VowN%!+DqQ
z`uh4Fg9Z&+qm(+sy6=a;OU9Uw0oRMFoCJ(lN)1TIrn3>x`}-NNPAN6b7_$v{(iroR
zQmQv_o>J<3OXf+(ai-=Yv-h_RpI?<bj<e6QUQ<(3G-AYvm+Zq1W6bNoN@Gl;QmU`F
zu|GfEFJsJH$8l!liAA3k3WZi%dFC<TX=6+cP^6R^3tS2~B649U6k3%Y8^>{maM0i;
zjwOoQaeN+O7*WPj&YhGqlXAYB%~FfV@(j!Na3{h^*JQ~0`aUrIB8kXiJ8P^!TH~{Y
ztY~v{bD4;&ETE^drlzJS-?N!7foyub)PZ@0`Y0kXt@Ry##?4!$cI43&cU||&s;Vl-
zx^|F#91-PbmW!c@vXuz+M0uMiTfOVgW+CLQ_F%ZKd%5qRZ^q|QBJ$*y@Gnmhk^c~p
z4I<JcBCeNEUne3jYOQA`lgShPx&+nL)nTpmKZwX{UIP4X5&1|&7Nk<C@qV7^K#|$%
z<H=qh-xHB$FGaP%OQ!$lcsxF^Gh^l@OwIQ6#YAMM_aVaE_V)In04*&oeXX(CkloGb
zo<u$s!|Nz7STFn-;RzP<u@}1zBfJZoNGp9<y6^FJfI|<-WO7tdQPF$e%elf%HR!&d
zO_ehf!}<;)!@E>6w}Z$4kK*ETJJ3KeCYb6&AE8j_Y^!MJeGu-3&#Q<q2gThP*Jth%
zu1jMftLVDKngHF697>g2`=VE}$C<kWCJ-XR5)_vJ4_I;UKQWKzf~ov^Lu-ATQtCUN
zi}CT=wQFDOzGNQ8BH%=XNkG)9c|MrRLl+{l)^*+Q=K8MEix5>PrT)v>%-%O)!UWwt
zH-P2bjza}5XA)*Cco}qt9i$k^|4<)H`=JRd{=Jhu31~IOm=>i}FW@-##H{;T?H_R*
z=hiR!r`-V&hN0Mma2|hVJ;T_D;slS(zh*wS1XF%UTjo}!RGAOb$BZ%eheDx$&sN_Z
zHh>Dn5)5}!$?HV8%_4FN!z00TAKGYcZa%VKzkXLLr6vKRfgwOoU^jcxM&C8Ytct~A
zi~9EM+mcJqS5M}0ZU&A<Ske*8*o(PTW=$Ima0tQ6WL)U|`_lMo$$TT<z+pC;C<|z0
zI_KhjOXpeUr-P{u;1^$QG$YKvV%W?A{s2IT3afTr&V1?s0lF2LujeQX*8`7vo50I~
zbOu;6!kxkN1UNXzT+9O~8u*CxkBQj7jr>z8yX>RP00Ef~a0COcKv=|TG!dqw_WULT
z@HF!>esUl{0H37#+haN-2(byx*%-DHrUod+(1zgxD);_)cz^)i+cJl|&&nMJ5#~wK
zKk%ZsHz0C=gUd2crGzr7QJiF5eS~>_K2{76AeW8&DzFKc;Vh<@KEMbRkK=F)Zy~{y
l1PBlyK!5-N0tD!0_<#2<S_NsRXUPBn002ovPDHLkV1hj3^1T26

literal 0
HcmV?d00001

diff --git a/src/MyWebLog/project.json b/src/MyWebLog/project.json
index 673b24b..6befde1 100644
--- a/src/MyWebLog/project.json
+++ b/src/MyWebLog/project.json
@@ -2,7 +2,7 @@
   "buildOptions": {
     "emitEntryPoint": true,
     "copyToOutput": {
-      "include": "views"
+      "include": [ "views", "content" ]
     }
   },
   "dependencies": {
diff --git a/src/myWebLog/content/scripts/tinymce-init.js b/src/MyWebLog/views/admin/content/tinymce-init.js
similarity index 100%
rename from src/myWebLog/content/scripts/tinymce-init.js
rename to src/MyWebLog/views/admin/content/tinymce-init.js
diff --git a/src/myWebLog/content/styles/admin.css b/src/myWebLog/content/styles/admin.css
deleted file mode 100644
index f6da49a..0000000
--- a/src/myWebLog/content/styles/admin.css
+++ /dev/null
@@ -1,5 +0,0 @@
-footer {
-  background-color: #808080;
-  border-top: solid 1px black;
-  color: white;
-}
\ No newline at end of file
diff --git a/src/myWebLog/views/admin/admin-layout.html b/src/myWebLog/views/admin/admin-layout.html
index 439dbcb..8b01c68 100644
--- a/src/myWebLog/views/admin/admin-layout.html
+++ b/src/myWebLog/views/admin/admin-layout.html
@@ -40,7 +40,7 @@
   <footer>
     <div class="container-fluid">
       <div class="row">
-        <div class="col-xs-12 text-right">@Model.Generator</div>
+        <div class="col-xs-12 text-right">@Model.FooterLogoLight &nbsp;</div>
       </div>
     </div>
   </footer>
diff --git a/src/myWebLog/views/admin/content/logo.png b/src/myWebLog/views/admin/content/logo.png
deleted file mode 100644
index bb6013e278a826bafac41f0016e7596a12bb6552..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5017
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

diff --git a/src/myWebLog/views/admin/dashboard.html b/src/myWebLog/views/admin/dashboard.html
index 3781a5d..c4e75a5 100644
--- a/src/myWebLog/views/admin/dashboard.html
+++ b/src/myWebLog/views/admin/dashboard.html
@@ -2,7 +2,7 @@
 
 @Section['Content']
   <div class="row">
-    <div class="col-xs-6">
+    <div class="col-xs-4 text-center">
       <h3>@Translate.Posts &nbsp;<span class="badge">@Model.Posts</span></h3>
       <p>
         <a href="/posts/list"><i class="fa fa-list-ul"></i> @Translate.ListAll</a>
@@ -10,7 +10,7 @@
         <a href="/post/new/edit"><i class="fa fa-plus"></i> @Translate.AddNew</a>
       </p>
     </div>
-    <div class="col-xs-6">
+    <div class="col-xs-4 text-center">
       <h3>@Translate.Pages &nbsp;<span class="badge">@Model.Pages</span></h3>
       <p>
         <a href="/pages"><i class="fa fa-list-ul"></i> @Translate.ListAll</a>
@@ -18,9 +18,7 @@
         <a href="/page/new/edit"><i class="fa fa-plus"></i> @Translate.AddNew</a>
       </p>
     </div>
-  </div>
-  <div class="row">
-    <div class="col-xs-6">
+    <div class="col-xs-4 text-center">
       <h3>@Translate.Categories &nbsp;<span class="badge">@Model.Categories</span></h3>
       <p>
         <a href="/categories"><i class="fa fa-list-ul"></i> @Translate.ListAll</a>
@@ -29,4 +27,5 @@
       </p>
     </div>
   </div>
+  <br />
 @EndSection
diff --git a/src/myWebLog/views/admin/page/edit.html b/src/myWebLog/views/admin/page/edit.html
index a87fe3c..081fbd3 100644
--- a/src/myWebLog/views/admin/page/edit.html
+++ b/src/myWebLog/views/admin/page/edit.html
@@ -12,7 +12,7 @@
         <div class="form-group">
           <label class="control-label" for="Permalink">@Translate.Permalink</label>
           <input type="text" name="Permalink" id="Permalink" class="form-control" value="@Model.Form.Permalink" />
-          <p class="form-hint"><em>@Translate.startingWith</em> http://@Model.webLog.urlBase/ </p>
+          <p class="form-hint"><em>@Translate.startingWith</em> http://@Model.WebLog.UrlBase/ </p>
         </div>
         <!-- // TODO: Markdown / HTML choice -->
        <div class="form-group">
@@ -48,7 +48,7 @@
 @EndSection
 
 @Section['Scripts']
-  <script type="text/javascript" src="/content/scripts/tinymce-init.js"></script>
+  <script type="text/javascript" src="/admin/content/tinymce-init.js"></script>
   <script type="text/javascript">
     /* <![CDATA[ */
     $(document).ready(function () { $("#Title").focus() })
diff --git a/src/myWebLog/views/admin/post/edit.html b/src/myWebLog/views/admin/post/edit.html
index ec00751..24a5357 100644
--- a/src/myWebLog/views/admin/post/edit.html
+++ b/src/myWebLog/views/admin/post/edit.html
@@ -13,7 +13,7 @@
           <label class="control-label" for="Permalink">@Translate.Permalink</label>
           <input type="text" name="Permalink" id="Permalink" class="form-control" value="@Model.Form.Permalink" />
           <!-- // FIXME: hard-coded "http" -->
-          <p class="form-hint"><em>@Translate.startingWith</em> http://@Model.webLog.urlBase/ </p>
+          <p class="form-hint"><em>@Translate.startingWith</em> http://@Model.WebLog.UrlBase/ </p>
         </div>
         <!-- // TODO: Markdown / HTML choice -->
         <div class="form-group">
@@ -47,19 +47,11 @@
             <h4 class="panel-title">@Translate.Categories</h4>
           </div>
           <div class="panel-body" style="max-height:350px;overflow:scroll;">
-            <!-- // TODO: how to check the ones that are already selected? -->
             @Each.Categories
-              <!-- - var tab = 0
-              while tab < item.indent
-                | &nbsp; &nbsp;
-                - tab++
-              - var attributes = {}
-              if -1 < currentCategories.indexOf(item.category.id)
-                - attributes.checked = 'checked' -->
-              <input type="checkbox" id="Category-@Current.Item1" name="Category", value="@Current.Item1" />
+              @Current.Indent
+              <input type="checkbox" id="Category-@Current.Id" name="Category" value="@Current.Id" @Current.CheckedAttr />
               &nbsp;
-              <!-- // FIXME: the title should be the category description -->
-              <label for="Category-@Current.Item1" title="@Current.Item2">@Current.Item2</label>
+              <label for="Category-@Current.Id" title="@Current.Description">@Current.Name</label>
               <br/>
             @EndEach
           </div>
@@ -86,7 +78,7 @@
 @EndSection
 
 @Section['Scripts']
-  <script type="text/javascript" src="/content/scripts/tinymce-init.js"></script>
+  <script type="text/javascript" src="/admin/content/tinymce-init.js"></script>
   <script type="text/javascript">
     /** <![CDATA[ */
     $(document).ready(function () { $("#Title").focus() })
diff --git a/src/myWebLog/views/themes/default/content/footer-logo.png b/src/myWebLog/views/themes/default/content/footer-logo.png
deleted file mode 100644
index 40fd00f0c3fa6180150ed96e8bfad748c611f195..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2257
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

diff --git a/src/myWebLog/views/themes/default/footer.html b/src/myWebLog/views/themes/default/footer.html
index 54ef6c1..ec3f017 100644
--- a/src/myWebLog/views/themes/default/footer.html
+++ b/src/myWebLog/views/themes/default/footer.html
@@ -3,7 +3,7 @@
   <div class="container-fluid">
     <div class="row">
       <div class="col-xs-12 text-right">
-        @Model.FooterLogo
+        @Model.FooterLogoDark
       </div>
     </div>
   </div>