notazof
/
yavsc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes the latest merge

main
Paul Schneider 10 years ago
parent 2963e2c4a0
commit d8a5ebd526
11 changed files with 72 additions and 64 deletions
Show Stats Download Patch File Download Diff File

31
Makefile
Unescape Escape View File

@ -3,15 +3,23 @@ VERSION=1.1
CONFIG=Debug CONFIG=Debug
LDYDESTDIR=dist/web/$(CONFIG) LDYDESTDIR=dist/web/$(CONFIG)
COPYUNCHANGED="false" COPYUNCHANGED="false"
RSYNCCMD=rsync -ravu --chown=www-data:www-data
HOST_rsync_dev=totemdev.localdomain HOST_rsync_yavsc=lua.pschneider.fr
DESTDIR_rsync_dev=/srv/www/totemdev DESTDIR_rsync_yavsc=/srv/www/yavsc
HOST_rsync_pre=totempre.localdomain
DESTDIR_rsync_pre=/srv/www/totempre HOST_rsync_lua=lua.pschneider.fr
HOST_rsync_prod=totemprod.pschneider.fr DESTDIR_rsync_lua=/srv/www/lua
DESTDIR_rsync_prod=/srv/www/totemprod
HOST_rsync_pre=lua.pschneider.fr
DESTDIR_rsync_pre=/srv/www/yavscpre
HOST_rsync_prod=lua.pschneider.fr
DESTDIR_rsync_prod=/srv/www/yavsc
DOCASSBS=NpgsqlBlogProvider.dll WorkFlowProvider.dll Yavsc.WebControls.dll ITContentProvider.dll NpgsqlMRPProviders.dll Yavsc.dll SalesCatalog.dll YavscModel.dll 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
all: deploy all: deploy
ddir: ddir:
@ -22,6 +30,7 @@ deploy: ddir build
xbuild /p:Configuration=$(CONFIG) /p:SkipCopyUnchangedFiles=$(COPYUNCHANGED) /p:DeployDir=../$(LDYDESTDIR) /t:Deploy web/Web.csproj xbuild /p:Configuration=$(CONFIG) /p:SkipCopyUnchangedFiles=$(COPYUNCHANGED) /p:DeployDir=../$(LDYDESTDIR) /t:Deploy web/Web.csproj
mv $(LDYDESTDIR)/Web.config $(LDYDESTDIR)/Web.config.new mv $(LDYDESTDIR)/Web.config $(LDYDESTDIR)/Web.config.new
rsync_% : HOST = $(HOST_$@) rsync_% : HOST = $(HOST_$@)
rsync_% : DESTDIR = $(DESTDIR_$@) rsync_% : DESTDIR = $(DESTDIR_$@)
@ -29,10 +38,9 @@ rsync_% : DESTDIR = $(DESTDIR_$@)
rsync_% : deploy rsync_% : deploy
echo "!Deploying to $(HOST)!" echo "!Deploying to $(HOST)!"
$(RSYNCCMD) dist/web/$(CONFIG)/ root@$(HOST):$(DESTDIR) $(RSYNCCMD) dist/web/$(CONFIG)/ root@$(HOST):$(DESTDIR)
ssh root@$(HOST) "service apache2 reload"
build: build:
xbuild /p:Configuration=$(CONFIG) /t:Build Totem.sln xbuild /p:Configuration=$(CONFIG) /t:Build Yavsc.sln
clean: clean:
xbuild /t:Clean xbuild /t:Clean
@ -56,9 +64,12 @@ htmldoc: xmldoc
docdeploy-prod: htmldoc docdeploy-prod: htmldoc
rsync -ravu web/htmldoc root@$(PRODHOSTDIR) rsync -ravu web/htmldoc root@$(PRODHOSTDIR)
rsync_dev: rsync_lua:
rsync_yavsc:
rsync_pre: rsync_pre:
rsync_prod: rsync_prod:

0
Totem.sln → Yavsc.sln
Unescape Escape View File

5
web/Models/NoLogin.master
Unescape Escape View File

@ -45,11 +45,6 @@ Yavsc.notice('<%=note%>');
</script> </script>
<% } %> <% } %>
</header> </header>
<nav data-type="background" data-speed="2">
<a href="<%= Url.RouteUrl("Default", new { controller = "Account", action = "Logout", returnUrl=Request.Url.PathAndQuery}) %>" accesskey = "C" class="menuitem">
<i class="fa fa-sign-out">Deconnexion</i></a>
</nav>
<main data-type="background" data-speed="10" data-emheight="10" data-posx="0" data-posy="22" > <main data-type="background" data-speed="10" data-emheight="10" data-posx="0" data-posy="22" >
<asp:ContentPlaceHolder ID="MainContent" runat="server"> <asp:ContentPlaceHolder ID="MainContent" runat="server">
</asp:ContentPlaceHolder> </asp:ContentPlaceHolder>

5
web/Scripts/yavsc.js
Unescape Escape View File

@ -62,8 +62,7 @@ self.onAjaxError = function (xhr, ajaxOptions, thrownError) {
return self; return self;
})(); })();
<<<<<<< HEAD
=======
$(document).ready(function(){ $(document).ready(function(){
$body = $("body"); $body = $("body");
@ -87,4 +86,4 @@ $(document).on({
}} }}
}); });
}); });
>>>>>>> 5cb90afe2ce804d06034b0e0aa52e73c33baff83

13
web/Views/Blogs/PostActions.ascx
Unescape Escape View File

@ -5,7 +5,18 @@
<% if (Membership.GetUser()!=null) { <% if (Membership.GetUser()!=null) {
if (Membership.GetUser().UserName==Model.Author || Roles.IsUserInRole("Admin")) if (Membership.GetUser().UserName==Model.Author || Roles.IsUserInRole("Admin"))
{ %> { %>
<% if (Model is BlogEntry) { %><%= Html.Partial("TagControl",Model)%><% } %> <% if (Model is BlogEntry) { %><%= Html.Partial("TagControl",Model)%>
<i class="fa fa-pencil"><%=Html.Translate("DoComment")%></i>
<aside class="control" class="hidden">
<% using (Html.BeginForm("Comment","Blogs")) { %>
<%=Html.Hidden("Author")%>
<%=Html.Hidden("Title")%>
<%=Html.TextArea("CommentText","")%>
<%=Html.Hidden("PostId",Model.Id)%>
<input type="submit" value="Poster un commentaire"/>
<% } %>
</aside>
<% } %>
<a href="<%= Url.RouteUrl("Default", new { action = "Edit", postid = Model.Id })%>" class="actionlink"> <a href="<%= Url.RouteUrl("Default", new { action = "Edit", postid = Model.Id })%>" class="actionlink">
<i class="fa fa-pencil"><%=Html.Translate("Edit")%></i> <i class="fa fa-pencil"><%=Html.Translate("Edit")%></i>
</a> </a>

16
web/Views/Blogs/TagPanel.ascx
Unescape Escape View File

@ -1,10 +1,12 @@
<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<TagInfo>" %> <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<TagInfo>" %>
<div class="panel"> <div class="panel">
<i class="fa fa-tag"><%=Model.Name%></i> <i class="fa fa-tag"><%=Html.Encode(Model.Name)%></i>
<ul> <% foreach (var t in Model.Titles) { %>
<% foreach (BasePostInfo be in Model.Titles) { %> <a href="<%= Url.RouteUrl("Titles", new { title = t.Title }) %>">
<li><%= be.Title %> <img src="<%=Url.Encode(t.Photo)%>" alt="placard" class="photo">
<span><%= be.Intro %></span> <%= Html.Markdown(t.Title,"/bfiles/"+t.Id+"/")%></a>
</li> <div class="postpreview">
<% } %></ul> <p><%= Html.Markdown(t.Intro,"/bfiles/"+t.Id+"/") %></p>
</div>
<% } %>
</div> </div>

21
web/Views/Blogs/UserPost.aspx
Unescape Escape View File

@ -27,32 +27,15 @@
<% } %> <% } %>
<%= Html.Markdown(be.Content,"/bfiles/"+be.Id+"/") %> <%= Html.Markdown(be.Content,"/bfiles/"+be.Id+"/") %>
<%= Html.Partial("PostActions",be)%>
<% string username = Membership.GetUser()==null ? null : Membership.GetUser().UserName; %> <% string username = Membership.GetUser()==null ? null : Membership.GetUser().UserName; %>
<% foreach (var c in (Comment[]) BlogManager.GetComments(be.Id)) { %> <% foreach (var c in (Comment[]) BlogManager.GetComments(be.Id)) { %>
<div class="comment" style="min-height:32px;"> <div class="comment" style="min-height:32px;">
<img style="clear:left;float:left;max-width:32px;max-height:32px;margin:.3em;" src="<%= Url.RouteUrl("Blogs", new { user = c.From } ) %>" alt="<%=c.From%>"/> <img class="avatar" src="<%= Url.RouteUrl("Default", new { action="Avatar", controller="Account", user = c.From } ) %>" alt="<%=c.From%>"/>
<%= Html.Markdown(c.CommentText) %> <%= Html.Markdown(c.CommentText) %>
<% if (Model.Author == username || c.From == username ) { %> <% if (Model.Author == username || c.From == username ) { %>
<%= Html.ActionLink("Supprimer","RemoveComment", new { cmtid = c.Id } , new { @class="actionlink" })%> <%= Html.ActionLink("Supprimer","RemoveComment", new { cmtid = c.Id } , new { @class="actionlink" })%>
<% } %> <% } %>
</div><% } %> </div><% } %>
<% if (Membership.GetUser()!=null) {
if (Membership.GetUser().UserName==be.Author)
{ %> <div class="control">
<%= Html.ActionLink("Editer","Edit", new { id = be.Id }, new { @class="actionlink" }) %>
<%= Html.ActionLink("Supprimer","RemovePost", new { id = be.Id }, new { @class="actionlink" } ) %>
<i class="fa fa-tag">Tagger</i>
</div><% } %> </div><% } %>
<aside class="control">
<% using (Html.BeginForm("Comment","Blogs")) { %>
<%=Html.Hidden("Author")%>
<%=Html.Hidden("Title")%>
<%=Html.TextArea("CommentText","")%>
<%=Html.Hidden("PostId",be.Id)%>
<input type="submit" value="Poster un commentaire"/>
<% } %>
</aside>
<% } %></div><% } %>
</asp:Content> </asp:Content>

2
web/Views/Blogs/UserPosts.aspx
Unescape Escape View File

@ -27,7 +27,7 @@
<%= Html.MarkdownToHtmlIntro(out truncated, e.Content,"/bfiles/"+e.Id+"/") %> <%= Html.MarkdownToHtmlIntro(out truncated, e.Content,"/bfiles/"+e.Id+"/") %>
<% if (truncated) { %> <% if (truncated) { %>
<a href="<%= Url.RouteUrl( "BlogByTitle", new { user=e.Author , title=e.Title, postid = e.Id}) %>"> <a href="<%= Url.RouteUrl( "BlogByTitle", new { user=e.Author , title=e.Title, postid = e.Id}) %>">
<i>Html.Translate("ReadMore")</i></a> <i><%=Html.Translate("ReadMore")%></i></a>
<% } %> <% } %>
<%= Html.Partial("PostActions",e)%> <%= Html.Partial("PostActions",e)%>
</div> </div>

8
web/Web.config
Unescape Escape View File

@ -251,16 +251,16 @@ http://msdn2.microsoft.com/en-us/library/b5ysx397.aspx
</root> </root>
</log4net> </log4net>
<connectionStrings> <connectionStrings>
<add name="yavsc" connectionString="Server=127.0.0.1;Port=5432;Database=totem;User Id=totemweb;Password=cZeoft2k5_d4;" providerName="Npgsql" /> <add name="yavsc" connectionString="Server=127.0.0.1;Port=5432;Database=YavscDev;User Id=yavscdev;Password=admin;" providerName="Npgsql" />
</connectionStrings> </connectionStrings>
<appSettings> <appSettings>
<add key="MonoServerDefaultIndexFiles" value="index.html,Index.aspx" /> <add key="MonoServerDefaultIndexFiles" value="index.html,Index.aspx" />
<add key="WorkflowContentProviderClass" value="yavsc.NpgsqlContentProvider" /> <add key="WorkflowContentProviderClass" value="yavsc.NpgsqlContentProvider" />
<add key="SmtpServer" value="smtp.free.fr" /> <add key="SmtpServer" value="smtp.free.fr" />
<add key="AdminEMail" value="paulschneider@free.fr" /> <add key="AdminEMail" value="paulschneider@free.fr" />
<add key="OwnerEMail" value="" /> <add key="OwnerEMail" value="paulschneider@free.fr" />
<add key="Name" value="TOTEM PRODUCTION" /> <add key="Name" value="PSc" />
<add key="DefaultController" value="Home" /> <add key="DefaultController" value="Blogs" />
<add key="DefaultAvatar" value="/images/noavatar.png;image/png" /> <add key="DefaultAvatar" value="/images/noavatar.png;image/png" />
<add key="RegistrationMessage" value="/RegistrationMail.txt" /> <add key="RegistrationMessage" value="/RegistrationMail.txt" />
<!-- <add key="ClientValidationEnabled" value="true" /> --> <!-- <add key="ClientValidationEnabled" value="true" /> -->

26
yavscModel/LocalizedText.fr.Designer.cs generated
Unescape Escape View File

@ -94,12 +94,6 @@ namespace Yavsc.Model {
} }
} }
public static string Count {
get {
return ResourceManager.GetString("Count", resourceCulture);
}
}
public static string ProviderName { public static string ProviderName {
get { get {
return ResourceManager.GetString("ProviderName", resourceCulture); return ResourceManager.GetString("ProviderName", resourceCulture);
@ -124,6 +118,12 @@ namespace Yavsc.Model {
} }
} }
public static string DoComment {
get {
return ResourceManager.GetString("DoComment", resourceCulture);
}
}
public static string Members { public static string Members {
get { get {
return ResourceManager.GetString("Members", resourceCulture); return ResourceManager.GetString("Members", resourceCulture);
@ -136,9 +136,9 @@ namespace Yavsc.Model {
} }
} }
public static string younotadmin { public static string Welcome {
get { get {
return ResourceManager.GetString("younotadmin", resourceCulture); return ResourceManager.GetString("Welcome", resourceCulture);
} }
} }
@ -238,6 +238,12 @@ namespace Yavsc.Model {
} }
} }
public static string younotadmin {
get {
return ResourceManager.GetString("younotadmin", resourceCulture);
}
}
public static string Tag_name { public static string Tag_name {
get { get {
return ResourceManager.GetString("Tag_name", resourceCulture); return ResourceManager.GetString("Tag_name", resourceCulture);
@ -304,9 +310,9 @@ namespace Yavsc.Model {
} }
} }
public static string Welcome { public static string Count {
get { get {
return ResourceManager.GetString("Welcome", resourceCulture); return ResourceManager.GetString("Count", resourceCulture);
} }
} }

1
yavscModel/LocalizedText.fr.resx
Unescape Escape View File

@ -20,6 +20,7 @@
<data name="Ciffer"><value>Chiffre</value></data> <data name="Ciffer"><value>Chiffre</value></data>
<data name="Circles"><value>Cercles</value></data> <data name="Circles"><value>Cercles</value></data>
<data name="Comment"><value>Commentaire</value></data> <data name="Comment"><value>Commentaire</value></data>
<data name="DoComment"><value>Commenter</value></data>
<data name="Create"><value>Créer</value></data> <data name="Create"><value>Créer</value></data>
<data name="Date_search"><value>Demande de rendez-vous</value></data> <data name="Date_search"><value>Demande de rendez-vous</value></data>
<data name="DocTemplateException"><value>Une erreur est survenue à la génération de votre document</value></data> <data name="DocTemplateException"><value>Une erreur est survenue à la génération de votre document</value></data>

Write Preview
Loading…