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 43c6ca87..00000000 Binary files a/web/App_Themes/delete.gif and /dev/null differ 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 + + * 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 * 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 (); } /// @@ -103,6 +101,10 @@ namespace Yavsc.Controllers return View (); } + public ActionResult RestrictedArea () + { + return View (); + } /// /// Contact the specified email, reason and body. /// 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 @@ -