From 40a49f5284bef0acb3918697920fe66a00198da2 Mon Sep 17 00:00:00 2001 From: Paul Schneider Date: Sun, 4 Oct 2015 15:50:47 +0200 Subject: [PATCH] Custo totem ++ MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * parralax.js: refactoring * drummer-652345_1280.xxs.jpg: * musician-923526_1280.xxs.jpg: * live-concert-388160_1280.xxs.jpg: totem style * Makefile: cleaner code * style.css: -> Totem * BlogsController.cs: Fixes edition validation * App.master: externalize the parralax javascript code, finishes the merge from yavsc * UserPosts.aspx: Affiche "pas de contenu" quand aucun post n'est à afficher * Web.csproj: Totem images * instdbws.sql: Header images --- ChangeLog | 4 + Makefile | 39 ++---- Yavsc.sln => Totem.sln | 0 web/App_Themes/style.css | 25 ++-- web/ChangeLog | 22 +++ web/Controllers/BlogsController.cs | 7 + web/Models/App.master | 146 +++----------------- web/Scripts/parralax.js | 74 ++++++++++ web/Views/Blogs/UserPosts.aspx | 4 +- web/Web.csproj | 4 + web/images/drummer-652345_1280.xxs.jpg | Bin 0 -> 35118 bytes web/images/live-concert-388160_1280.xxs.jpg | Bin 0 -> 24920 bytes web/images/musician-923526_1280.xxs.jpg | Bin 0 -> 50469 bytes web/instdbws.sql | 20 +++ 14 files changed, 177 insertions(+), 168 deletions(-) rename Yavsc.sln => Totem.sln (100%) create mode 100644 web/Scripts/parralax.js create mode 100644 web/images/drummer-652345_1280.xxs.jpg create mode 100644 web/images/live-concert-388160_1280.xxs.jpg create mode 100644 web/images/musician-923526_1280.xxs.jpg diff --git a/ChangeLog b/ChangeLog index abc93c00..450dece7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2015-10-04 Paul Schneider + + * Makefile: cleaner code + 2015-08-20 Paul Schneider * Yavsc.sln: Adds the `Presta` project diff --git a/Makefile b/Makefile index c1305b83..61d2d5e2 100644 --- a/Makefile +++ b/Makefile @@ -3,25 +3,17 @@ VERSION=1.1 CONFIG=Debug LDYDESTDIR=build/web/$(CONFIG) COPYUNCHANGED="false" - -HOST_rsync_local=localhost -DESTDIR_rsync_local=/srv/www/yavsc - -HOST_rsync_test=localhost -DESTDIR_rsync_test=/srv/www/lua - -HOST_rsync_pre=lua.localdomain -DESTDIR_rsync_pre=/srv/www/yavsc - -HOST_rsync_prod=lua.localdomain -DESTDIR_rsync_prod=/srv/www/lua - -DOCASSBS=NpgsqlBlogProvider.dll WorkFlowProvider.dll Yavsc.WebControls.dll ITContentProvider.dll NpgsqlMRPProviders.dll Yavsc.dll SalesCatalog.dll YavscModel.dll - RSYNCCMD=rsync -ravu --chown=www-data:www-data +HOST_rsync_dev=totemdev.localdomain +DESTDIR_rsync_dev=/srv/www/totemdev +HOST_rsync_pre=totempre.localdomain +DESTDIR_rsync_pre=/srv/www/totempre +HOST_rsync_prod=totemprod.pschneider.fr +DESTDIR_rsync_prod=/srv/www/totemprod +DOCASSBS=NpgsqlBlogProvider.dll WorkFlowProvider.dll Yavsc.WebControls.dll ITContentProvider.dll NpgsqlMRPProviders.dll Yavsc.dll SalesCatalog.dll YavscModel.dll all: deploy - + ddir: mkdir -p $(LDYDESTDIR) @@ -30,15 +22,13 @@ deploy: ddir build xbuild /p:Configuration=$(CONFIG) /p:SkipCopyUnchangedFiles=$(COPYUNCHANGED) /p:DeployDir=../$(LDYDESTDIR) /t:Deploy web/Web.csproj mv $(LDYDESTDIR)/Web.config $(LDYDESTDIR)/Web.config.new - rsync_% : HOST = $(HOST_$@) - + rsync_% : DESTDIR = $(DESTDIR_$@) - + rsync_% : deploy echo "!Deploying to $(HOST)!" $(RSYNCCMD) build/web/$(CONFIG)/ root@$(HOST):$(DESTDIR) - ssh root@$(HOST) apachectl restart build: xbuild /p:Configuration=$(CONFIG) /t:Build Yavsc.sln @@ -46,6 +36,8 @@ build: clean: xbuild /t:Clean find -name "StyleCop.Cache" -exec rm {} \; + +distclean: clean rm -rf $(LDYDESTDIR) sourcepkg: @@ -63,14 +55,9 @@ htmldoc: xmldoc docdeploy-prod: htmldoc rsync -ravu web/htmldoc root@$(PRODHOSTDIR) -rsync_local: - -rsync_test: +rsync_dev: rsync_pre: rsync_prod: -bigrsync: rsync_test rsync_local rsync_pre rsync_prod - - diff --git a/Yavsc.sln b/Totem.sln similarity index 100% rename from Yavsc.sln rename to Totem.sln diff --git a/web/App_Themes/style.css b/web/App_Themes/style.css index 5696ff56..784232e3 100644 --- a/web/App_Themes/style.css +++ b/web/App_Themes/style.css @@ -5,13 +5,14 @@ body { color: #D0FFD0; font-family: 'Arial', cursive; padding: 0em; + margin: 0; } .iconsmall { max-height: 1.3em; max-width: 1.3em; } input, textarea, checkbox { color: #FFFFA0; - background: black; + background-color: black; } header { @@ -22,8 +23,11 @@ header { display: block; min-height: 10em; text-align: center; - background: url("/images/star-939235_1280.jpg") 0 0 no-repeat fixed; + background: url("/images/totemprod.png") 0 0 no-repeat fixed; } +header h1, header a { +background-color: rgba(0,0,0,.5); +} nav { border-radius:1em; @@ -55,14 +59,13 @@ footer { justify-content: center; } footer a { - background-color: rgba(0,0,40,.8); border-radius:5px; margin:.5em; padding:1em; } -#copyr { text-align: center; } -footer p { background-color: rgba(20,20,20,.5); } +#copyr { text-align: center; display: block; background-color: rgba(20,20,20,.5); } +footer p { display:inline-block; } footer img { max-height: 2em; vertical-align: middle; } a.actionlink img, h1 img, .menuitem img { vertical-align: middle; } @@ -108,7 +111,7 @@ aside { color: #aaa; border-radius:10px; } -.hiddenpost { background-color: rgba(16,16,0,0.3); } +.hiddenpost { background-color: rgba(16,16,16,0.7); } .fullwidth { width: 100%; } textarea.fullwidth { min-height:10em; } @@ -144,8 +147,6 @@ content: ")"; a { text-decoration: none; color: #B0B080; - background-color:rgba(20,0,20,0.5); - text-decoration: none; } .usertitleref { color: #B0B080; @@ -281,25 +282,25 @@ input, select { margin: .5em; padding: .5em; min-height: 3em; - background: url("/images/star-939235_1280.xxs.jpg") 0 0 no-repeat fixed; + padding-top: 5em; } nav { margin: .5em; padding: .5em; min-height: 3em; - background: url("/images/helix-nebula-1400x1400.xxs.jpg") 50% 10% repeat fixed ; + background: url("/images/live-concert-388160_1280.xxs.jpg") 50% 10% repeat fixed ; } main { margin: .5em; padding: .5em; min-height: 7em; - background: url("/images/p8-av4.xxs.jpg") 50% 20em no-repeat fixed ; + background: url("/images/musician-923526_1280.xxs.jpg") 50% 20em repeat fixed ; } footer { margin: .5em; padding: .5em; min-height: 3em; - background: url("/images/helix-nebula-1400x1400.xxs.jpg") 50% 90% repeat fixed ; + background: url("/images/drummer-652345_1280.xxs.jpg") 50% 90% repeat fixed ; } .menuitem { display: block; diff --git a/web/ChangeLog b/web/ChangeLog index 6e18199a..b6dd02c4 100644 --- a/web/ChangeLog +++ b/web/ChangeLog @@ -1,3 +1,25 @@ +2015-10-04 Paul Schneider + + * parralax.js: refactoring + + * drummer-652345_1280.xxs.jpg: + * musician-923526_1280.xxs.jpg: + * live-concert-388160_1280.xxs.jpg: totem style + + * style.css: -> Totem + + * BlogsController.cs: Fixes edition validation + + * App.master: externalize the parralax javascript code, + finishes the merge from yavsc + + * UserPosts.aspx: Affiche "pas de contenu" quand aucun post + n'est à afficher + + * Web.csproj: Totem images + + * instdbws.sql: Header images + 2015-10-02 Paul Schneider * style.css: yauniformisation small & large screens. diff --git a/web/Controllers/BlogsController.cs b/web/Controllers/BlogsController.cs index aec2210b..d448f00c 100644 --- a/web/Controllers/BlogsController.cs +++ b/web/Controllers/BlogsController.cs @@ -276,6 +276,13 @@ namespace Yavsc.Controllers model.Id = BlogManager.Post (model.Author, model.Title, model.Content, model.Visible, model.AllowedCircles); return RedirectToAction ("UserPosts", new { user = model.Author, title = model.Title }); } + ViewData ["AllowedCircles"] = + CircleManager.DefaultProvider.List ( + Membership.GetUser ().UserName).Select (x => new SelectListItem { + Value = x.Id.ToString(), + Text = x.Title, + Selected = model.AllowedCircles.Contains (x.Id) + }); return View ("Edit", model); } diff --git a/web/Models/App.master b/web/Models/App.master index 295a566d..b41346c4 100644 --- a/web/Models/App.master +++ b/web/Models/App.master @@ -15,64 +15,9 @@ + @@ -80,79 +25,43 @@ $(document).ready(function(){ -<<<<<<< HEAD -
-=======
->>>>>>> bdae927f67893f93bc3681bb9c7fa08d0ca04a93 - - -

<%=ViewState["orgtitle"]%> +

+<%=ViewState["orgtitle"]%> - "><%= YavscHelpers.SiteName %>

- - -
<%= (ViewData["Error"]!=null)? Html.Encode(ViewData["Error"]) : "" %>
<%= Html.Encode(ViewData["Message"]) %>
-
- -<<<<<<< HEAD -