From c327395b5b98303532485605ac8a081f191d4be5 Mon Sep 17 00:00:00 2001 From: Paul Schneider Date: Wed, 5 Aug 2015 02:02:14 +0200 Subject: [PATCH] * style.css: * Gives main background a color * lets small screens keep their font sizes * Catalog.xml: makes it a better * BlogsController.cs: Fixes the access to the Blog * App.master: fixes the quick link to the user's blog * Index.aspx: removes the table * UserPosts.aspx: Mainly links to UserPost --- web/App_Themes/style.css | 15 ++++++++------- web/Catalog.xml | 28 +++++++++++++++++++++------- web/ChangeLog | 15 +++++++++++++++ web/Controllers/BlogsController.cs | 2 +- web/Models/App.master | 15 +++++++++------ web/Views/Blogs/Index.aspx | 19 ++++++++----------- web/Views/Blogs/UserPosts.aspx | 6 +++--- 7 files changed, 65 insertions(+), 35 deletions(-) diff --git a/web/App_Themes/style.css b/web/App_Themes/style.css index ce97cf3b..0468f5ec 100644 --- a/web/App_Themes/style.css +++ b/web/App_Themes/style.css @@ -21,6 +21,7 @@ input, textarea, checkbox { main { margin:1em; + background-color: rgba(64,64,64,0.6); } fieldset { background-color: rgba(32,16,16,0.8); @@ -44,12 +45,12 @@ footer { z-index:-1; font-size: smaller; } + .thanks { max-width: 10%; text-align: center; - vertical-align: text-bottom; font-size:smaller; - display:block; + display:inline; bottom:0; } @@ -63,7 +64,6 @@ footer { .panel,.bshpanel,aside { background-color: rgba(32,16,16,0.8); border-radius:5px; border: solid 1px #000060; - float: left; margin:.5em; padding: .5em; } @@ -71,6 +71,7 @@ footer { .bsh { float: right; } #login { +background-color: rgba(32,0,0,.5); position: fixed; margin:0em; padding:0em; @@ -90,8 +91,6 @@ header { left:0; margin:0em; padding:0em; - text-align: center; - max-width:55%; } h1 img { vertical-align: text-top; } @@ -167,6 +166,8 @@ ul.preview li:nth-child(n) { color: #f88; } +usertitleref { +} .actionlink { color: #B0B080; @@ -175,6 +176,8 @@ ul.preview li:nth-child(n) { background-color:rgba(0,0,32,0.8); cursor: pointer; font-family: 'Arial', cursive; + font-size: 140%; + display:block; } input, select { @@ -247,7 +250,6 @@ a.actionlink img { top:4px; } font-size: x-small; } - body { font-size: smaller; } .c2 { display:initial; } .c2-alt { display:none; } .c3 { display:none; } @@ -255,7 +257,6 @@ a.actionlink img { top:4px; } } @media all and (max-width: 350px) { - footer { font-size: xx-small; } .c2 { display:none; } .c2-alt { display:initial; } } diff --git a/web/Catalog.xml b/web/Catalog.xml index 10d6b2b6..6ba9dfdc 100644 --- a/web/Catalog.xml +++ b/web/Catalog.xml @@ -2,7 +2,7 @@ - shdsi + psc Votre logiciel, efficace, sûr, et sur mesure /images/logoDev.png @@ -11,20 +11,34 @@ - Systèmes d'information et sites Web + Conseil, conception logicielle + ccl + + + Aide au choix technologiques + tout un art + conseil + + + Conceptualisation de projet + Consolidation d'un niveau logique de projet, spécifications détaillées + concept + + + + + Développement et maintenance ntic Développement - Votre Extranet, Intranet, - site Web, sur mesure, élégant et efficace, au look racé, accessible, - et développé en cycles courts - nticdev + Votre appli développée en cycles courts + dev Maintenance Correction des anomalies, réalisation des évolutions, prévision des besoins - nticmaint + main diff --git a/web/ChangeLog b/web/ChangeLog index ed23ebe2..15c3f5b0 100644 --- a/web/ChangeLog +++ b/web/ChangeLog @@ -1,3 +1,18 @@ +2015-08-05 Paul Schneider + + * style.css: * Gives main background a color + * lets small screens keep their font sizes + + * Catalog.xml: makes it a better + + * BlogsController.cs: Fixes the access to the Blog + + * App.master: fixes the quick link to the user's blog + + * Index.aspx: removes the table + + * UserPosts.aspx: Mainly links to UserPost + 2015-08-04 Paul Schneider * bg.gif: diff --git a/web/Controllers/BlogsController.cs b/web/Controllers/BlogsController.cs index c04956dc..dfdca21e 100644 --- a/web/Controllers/BlogsController.cs +++ b/web/Controllers/BlogsController.cs @@ -135,7 +135,7 @@ namespace Yavsc.Controllers if (uuc.Count>0) return View ("UserPost", new UUTBlogEntryCollection(uuc.UserName, uuc[0].Title,uuc)); - return View ("Index", uuc); + return View ("UserPosts", uuc); } /// diff --git a/web/Models/App.master b/web/Models/App.master index b8fa120d..8e85dc9e 100644 --- a/web/Models/App.master +++ b/web/Models/App.master @@ -1,4 +1,4 @@ -<%@ Master Language="C#" Inherits="System.Web.Mvc.ViewMasterPage" %> +<%@ Master Language="C#" Inherits="System.Web.Mvc.ViewMasterPage" CodeBehind="App.master.cs" %> @@ -38,14 +38,15 @@ ViewState["orgtitle"] = T.GetString(Page.Title);
- "> Votre Blog
- "> + "> <%=Html.Encode(YavscHelpers.SiteName) %>
Page d'accueil
 <% if (Membership.GetUser()==null) { %>
<%= Html.ActionLink("Authentification", "Login", "Account", new { returnUrl=Request.Url.PathAndQuery },null) %> Pourquoi s'authentifier?

-<% } else { %> +<% } else { %> + Votre Blog
+ <%= Html.ActionLink(HttpContext.Current.User.Identity.Name, "Profile", "Account", new { id = HttpContext.Current.User.Identity.Name }, null) %> Édition de votre profile
Poster @@ -59,8 +60,10 @@ ViewState["orgtitle"] = T.GetString(Page.Title); <%= Html.ActionLink("Contact","Contact","Home",null, new { @class="thanks" }) %> <% foreach ( Link link in Html.Thanks()) { %> <% if (link.Image !=null) { - %><%= link.Text %><% - } else { %><%= link.Text %><% }} %> + %><%= link.Text %> + <% } else { %> + <%= link.Text %> + <% }} %>