From a62cff223ce2885a7267b74d4995cc2b8e4348db Mon Sep 17 00:00:00 2001
From: Paul Schneider <paul@pschneider.fr>
Date: Wed, 18 Nov 2015 00:30:07 +0100
Subject: [PATCH] Fixes

* style.css:
* style.css:
* UsersInRole.aspx: refactoring

* HomeController.cs: Fixes the restricted area error page

* PostActions.ascx: html structure

* TagControl.ascx: Tags reside in a list here, treat it as an Html one

* RestrictedArea.aspx: Shows allowed users or/and roles in the error
  page

* Web.csproj: cleaning
---
 web/App_Themes/dark/style.css      |   4 ----
 web/App_Themes/delete.gif          | Bin 752 -> 0 bytes
 web/App_Themes/style.css           |  30 +++++++++++++++++++++++++----
 web/ChangeLog                      |  18 +++++++++++++++++
 web/Controllers/HomeController.cs  |   6 ++++--
 web/Views/Admin/UsersInRole.aspx   |   3 +--
 web/Views/Blogs/PostActions.ascx   |   5 ++---
 web/Views/Blogs/TagControl.ascx    |   6 +++---
 web/Views/Home/RestrictedArea.aspx |   8 ++++++--
 web/Web.csproj                     |   1 -
 10 files changed, 60 insertions(+), 21 deletions(-)
 delete mode 100644 web/App_Themes/delete.gif

diff --git a/web/App_Themes/dark/style.css b/web/App_Themes/dark/style.css
index 201837dc..e1a44004 100644
--- a/web/App_Themes/dark/style.css
+++ b/web/App_Themes/dark/style.css
@@ -6,9 +6,6 @@ body {
 	background-color: black;
 	color: #D0FFD0;
 }
-.tagname {  color: #D0FFD0; }
-.tagname+.tagname:before { content: ', '; } 
-.tagname:hover { cursor:pointer; background-color: red; }
 
 
 .rate {
@@ -101,7 +98,6 @@ main video, main img {
 aside { 
 	display: inline-block;
 	float: right;
-	max-width: 40em;
 }
 
 .postpreview {
diff --git a/web/App_Themes/delete.gif b/web/App_Themes/delete.gif
deleted file mode 100644
index 43c6ca8763d79bde87bcf437e497af00c8be562d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 752
zcmZ?wbhEHb6kt$bc*el6GthYN-n}zt&b)vB{*)<GZZDnssVwQ*wQJ8pz3-M6ef|3N
zTw?I^BRjWl-THaiqIb<TR|-<zzkh%9=+U)n*M2*H{@2X5mq}6Aa+CK)+kfaTd)M9Y
zW&YeVXU=?m_V93u_p1$S-kmu7EY$ycOu&bh{H05m9`-kWR9EwH&eRVR>i+-#|NQy$
zABXln&Q1FL`t{#CH*SY|{oJwc*Qz;h;)0))7aYq9ewP~fc2e)_P3vAY)$9wl{IzJp
zy{ydlr;a^HiGHwZ{*SH8FZkJhE{gei`OM?;ir*_{?@ji478&@mD*tSH_`A&5@6Vqe
z@G<&xeCOwiq-WvY-<q?(PpbX8Zpp{q%CC#&{pc>eS5f?;vgCP8#IHGBw=+^cY}xvy
zx8c*8mDl2ff1W;kCeZrNm9vlQYJg5<pbb#`$->Caki?(^G9DBs4DA0KlA4-ZT3fl8
z8F_gb*}2-1v>0WWwY1oIg_&Emc-aM+Wn|bpRc1GF^$N-etzA1qr9X*XNNWw_j-BjG
zGEKc(x)1gUF{(82E@ad^eMXp9hUxg0Q)f<}lVRDncBb&%dq*yAR+(|<o-jL$(28?2
zo;??45^QExc`no~#IC}^-ui`UvIUER!h-n=LseJ=rYP`FI@~V6z4by;((yhm^C*W!
z21kx@DaO@p*l}R7K&xy_%z+DytsIk;xgB`2439K+b7?GbXmoN_5mIg1@_?b4)vHb2
zW4=iz(~<TC27yT_6CAg$YSazO;JC%ee5xbs^c)q-iOvDjBs>l-D@bZwvw%g)cL7VG
z)An_f*+XqOetkIP*eg{wS7K(+qJ{-x0ue3?v&y~1d1To>MqD_2keNGNE=Pc|!BJ7b
fV_(F^#N=Z_Jo9)pKRPly^YODPxtB<AFjxZs(@{iI

diff --git a/web/App_Themes/style.css b/web/App_Themes/style.css
index e5c25f52..2fb4dd2f 100644
--- a/web/App_Themes/style.css
+++ b/web/App_Themes/style.css
@@ -4,9 +4,7 @@ body {
 	padding: 0;
 	margin: 0;
 }
-
-.tagname+.tagname:before { content: ', '; } 
-.tagname:hover { cursor:pointer; }
+ 
 
 /* Start by setting display:none to make this hidden.
    Then we position it in relation to the viewport window
@@ -27,6 +25,7 @@ body {
                 no-repeat;
     overflow:   auto; 
 }
+
 .dispmodal {
     position:   fixed;
     z-index:    1000;
@@ -140,9 +139,32 @@ display: inline-block;
 .c2 { font-size: small; font-style: italic; }
 .c3 { font-size: x-small; font-style: italic; }
 
-.rate { width:5em; cursor: pointer; text-align:center; }
+.rate { 
+	display:inline-bloc; width:5em; cursor: pointer; text-align:center; 
+	}
 h2 select { font-size: large; }
 
+ul.editablelist { 
+	display: inline;
+	}
+ul.editablelist>li { 
+	display: inline;
+	margin:.5em;
+	padding:.2em;
+	border: solid grey 1px;
+	border-radius: 1em;
+}
+
+ul.editablelist>li:hover { 
+	background-color: rgba(128,0,0,0.5);
+	cursor:pointer;
+}
+
+ul.editablelist>li:hover:after { 
+  font-family: 'FontAwesome';
+  content: "\f00d";
+  }
+
 @media print {
 		body {background-color:white;color:black;}
 		.control, .actionlink,  .menuitem, nav { display:none;} 
diff --git a/web/ChangeLog b/web/ChangeLog
index aa32038d..21750ca7 100644
--- a/web/ChangeLog
+++ b/web/ChangeLog
@@ -1,3 +1,21 @@
+2015-11-18  Paul Schneider  <paul@pschneider.fr>
+
+	* style.css:
+	* style.css:
+	* UsersInRole.aspx: refactoring
+
+	* HomeController.cs: Fixes the restricted area error page
+
+	* PostActions.ascx: html structure
+
+	* TagControl.ascx: Tags reside in a list here, treat it as an
+	Html one
+
+	* RestrictedArea.aspx: Shows allowed users or/and roles in the
+	error page
+
+	* Web.csproj: cleaning
+
 2015-11-17  Paul Schneider  <paul@pschneider.fr>
 
 	* RateControl.ascx: A rate control for the Front Office
diff --git a/web/Controllers/HomeController.cs b/web/Controllers/HomeController.cs
index 9b3b5624..0a59f638 100644
--- a/web/Controllers/HomeController.cs
+++ b/web/Controllers/HomeController.cs
@@ -90,9 +90,7 @@ namespace Yavsc.Controllers
 				TagInfo ti = BlogManager.GetTagInfo (tagname);
 				// TODO specialyze BlogEntry creating a PhotoEntry 
 				ViewData [tagname] = ti;
-
 			}
-				
 			return View ();
 		}
 		/// <summary>
@@ -103,6 +101,10 @@ namespace Yavsc.Controllers
 			return View ();
 		}
 
+		public ActionResult RestrictedArea ()
+		{
+			return View ();
+		}
 		/// <summary>
 		/// Contact the specified email, reason and body.
 		/// </summary>
diff --git a/web/Views/Admin/UsersInRole.aspx b/web/Views/Admin/UsersInRole.aspx
index d2ffc7e0..7b073f84 100644
--- a/web/Views/Admin/UsersInRole.aspx
+++ b/web/Views/Admin/UsersInRole.aspx
@@ -11,11 +11,10 @@
 </h1>
 </asp:Content>
 <asp:Content ContentPlaceHolderID="MainContent" ID="MainContentContent" runat="server">
-<ul>
+<ul class="editablelist userlist">
  <%foreach (string username in (string[]) ViewData["UsersInRole"]){ %>
  <li><%= username %></li>
  <% } %>
  </ul>
-
 <%= Html.Partial("AddUserToRole") %>
 </asp:Content>
\ No newline at end of file
diff --git a/web/Views/Blogs/PostActions.ascx b/web/Views/Blogs/PostActions.ascx
index 6c2d12e3..7ba1c37e 100644
--- a/web/Views/Blogs/PostActions.ascx
+++ b/web/Views/Blogs/PostActions.ascx
@@ -10,15 +10,14 @@
   <%= Html.Partial("TagControl",Model)%>
 <% if (Model is BlogEntry) { %>
 <i class="fa fa-pencil"><%=Html.Translate("DoComment")%></i>
- <aside class="control" class="hidden">
 	 <% using (Html.BeginForm("Comment","Blogs")) { %>
+	 <filedset>
 	 <%=Html.Hidden("Author")%>
 	 <%=Html.Hidden("Title")%>
 	 <%=Html.TextArea("CommentText","")%>
 	 <%=Html.Hidden("PostId",Model.Id)%>
 	 <input type="submit" value="Poster un commentaire"/>
-	 <% } %>
-	  </aside>
+	 </filedset> <% } %>
 <% } %>
 	 <a href="<%= Url.RouteUrl("Default", new { action = "EditId", postid = Model.Id })%>" class="actionlink">
 	 <i class="fa fa-pencil"><%=Html.Translate("Edit")%></i>
diff --git a/web/Views/Blogs/TagControl.ascx b/web/Views/Blogs/TagControl.ascx
index 1d1afc74..bef188ac 100644
--- a/web/Views/Blogs/TagControl.ascx
+++ b/web/Views/Blogs/TagControl.ascx
@@ -1,10 +1,10 @@
 <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<BasePost>" %>
-<p id="tags<%=Model.Id%>" data-postid="<%=Model.Id%>" class="fa fa-tag">
+<ul id="tags<%=Model.Id%>" data-postid="<%=Model.Id%>" class="editablelist ">
 <% if (Model.Tags != null) {
 foreach ( var tagname in Model.Tags) { %>
-<span class="tagname"><%=tagname%></span> <%
+<li class="tagname fa fa-tag"><%=tagname%></li> <%
 %><% } } %>
-</p>
+</ul>
 <% if (Membership.GetUser()!=null) { %>
 <% if (Membership.GetUser().UserName==Model.Author || Roles.IsUserInRole("Admin"))
 { // grant all permissions: to choose a given set of tags, also create some new tags %>
diff --git a/web/Views/Home/RestrictedArea.aspx b/web/Views/Home/RestrictedArea.aspx
index e9fee24e..c5661362 100644
--- a/web/Views/Home/RestrictedArea.aspx
+++ b/web/Views/Home/RestrictedArea.aspx
@@ -1,7 +1,11 @@
 <%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage<BlogEntryCollection>" MasterPageFile="~/Models/App.master"%>
 <asp:Content ContentPlaceHolderID="MainContent" ID="MainContentContent" runat="server">
-	Ce contenu est d'accès restreint : &lt;<%= Html.Encode(ViewData["ControllerName"]) %>/<%= Html.Encode(ViewData["ActionName"]) %>&gt;
+	Ce contenu est d'accès restreint :<br>
+	 &lt;<%= Html.Encode(ViewData["ControllerName"]) %>/<%= Html.Encode(ViewData["ActionName"]) %>&gt;<br>
 
-	Demandez à l'administrateur les autorisations suffisantes pour accèder à cet emplacement.
 
+	Ci après les tièrces parties autorisée actuellement :<br>
+
+	Roles autorisés :<%= Html.Encode(ViewData["Roles"]) %><br>
+	Utilisateurs autorisés :<%= Html.Encode(ViewData["Users"]) %><br>
 </asp:Content>
\ No newline at end of file
diff --git a/web/Web.csproj b/web/Web.csproj
index e0b6d6d7..813d20d1 100644
--- a/web/Web.csproj
+++ b/web/Web.csproj
@@ -483,7 +483,6 @@
     <Content Include="Views\Admin\UserCard.ascx" />
     <Content Include="App_Themes\dark\style.css" />
     <Content Include="Views\Home\Contact.template.aspx" />
-    <Content Include="Views\Home\Contact.totem.aspx" />
     <Content Include="Views\Home\RestrictedArea.aspx" />
     <Content Include="Views\FrontOffice\Skills.aspx" />
     <Content Include="Views\Blogs\RateControl.ascx" />