From 029a80e2c46b7d44541272387813b19019268bb4 Mon Sep 17 00:00:00 2001 From: Paul Schneider Date: Thu, 19 Nov 2015 16:30:45 +0100 Subject: [PATCH] Fixes the Site wize skills page, makes use of Mono.Web.Xdt at deploy time * PayPalController.cs: implements a Paypal controller * Abort.aspx: Paypal paiement aborting page * Commit.aspx: Paypal paiement commit page * IPN.aspx: Paypal paiement notification page * Index.aspx: Paypal paiement form page * WebTasks.dll: thanks to he Marcelo Zabani's coding blog: * .gitignore: ignore my new config transformation sources * pkg.mdproj: * Presta.csproj: * TestAPI.csproj: * fortune.csproj: * SalesCatalog.csproj: * ITContentProvider.csproj: * NpgsqlMRPProviders.csproj: * NpgsqlBlogProvider.csproj: * NpgsqlContentProvider.csproj: adds a build target named "Lua" * Makefile: instead of `deploy`, start Xsp, in the `dist` folder * Yavsc.sln: * YavscModel.csproj: * WebControls.csproj: * YavscClient.csproj: Lua config * yavsc.rate.js: refactoring, still needs a cleanning * RateSkillControl.ascx: give it the `rate-site-skill` `data-type` html attribute * RateUserSkillControl.ascx: cleans an obsolete code chunk * Web.csproj: Fixes the missing RateSkillControl at deploy time, adds my deployment config --- .gitignore | 11 +- ChangeLog | 9 + ITContentProvider/ChangeLog | 4 + ITContentProvider/ITContentProvider.csproj | 7 + Makefile | 10 +- NpgsqlBlogProvider/ChangeLog | 4 + NpgsqlBlogProvider/NpgsqlBlogProvider.csproj | 7 + NpgsqlContentProvider/ChangeLog | 5 + .../NpgsqlContentProvider.csproj | 7 + NpgsqlMRPProviders/ChangeLog | 4 + NpgsqlMRPProviders/NpgsqlMRPProviders.csproj | 7 + Presta/ChangeLog | 4 + Presta/Presta.csproj | 7 + SalesCatalog/ChangeLog | 4 + SalesCatalog/SalesCatalog.csproj | 7 + TestAPI/ChangeLog | 4 + TestAPI/TestAPI.csproj | 7 + WebControls/ChangeLog | 4 + WebControls/WebControls.csproj | 7 +- Yavsc.sln | 24 + pkg/ChangeLog | 4 + pkg/pkg.mdproj | 2 + plugins/fortune/ChangeLog | 4 + plugins/fortune/fortune.csproj | 7 + web/{App_Data => App_Code}/Sql/Skills.sql | 0 web/{App_Data => App_Code}/Sql/instdbws.sql | 0 web/ChangeLog | 27 + web/Controllers/PayPalController.cs | 43 ++ web/Scripts/yavsc.rate.js | 2 +- web/Views/FrontOffice/RateSkillControl.ascx | 5 +- .../FrontOffice/RateUserSkillControl.ascx | 1 - web/Views/FrontOffice/Skills.aspx | 6 +- web/Views/PayPal/Abort.aspx | 11 + web/Views/PayPal/Commit.aspx | 11 + web/Views/PayPal/IPN.aspx | 11 + web/Views/PayPal/Index.aspx | 22 + web/Web.config | 506 +++++++++--------- web/Web.csproj | 27 +- web/WebTasks.dll | Bin 0 -> 4608 bytes web/packages.config | 1 + yavscModel/ChangeLog | 4 + yavscModel/YavscModel.csproj | 7 + yavscclient/ChangeLog | 4 + yavscclient/YavscClient.csproj | 7 + 44 files changed, 574 insertions(+), 281 deletions(-) create mode 100644 ITContentProvider/ChangeLog rename web/{App_Data => App_Code}/Sql/Skills.sql (100%) rename web/{App_Data => App_Code}/Sql/instdbws.sql (100%) create mode 100644 web/Controllers/PayPalController.cs create mode 100644 web/Views/PayPal/Abort.aspx create mode 100644 web/Views/PayPal/Commit.aspx create mode 100644 web/Views/PayPal/IPN.aspx create mode 100644 web/Views/PayPal/Index.aspx create mode 100755 web/WebTasks.dll diff --git a/.gitignore b/.gitignore index 1416bc47..6b77999b 100644 --- a/.gitignore +++ b/.gitignore @@ -10,11 +10,12 @@ dist bower_components node_modules svg -web/Web.config.prod -web/Web.config.dev -web/Web.config.lua +web/bfiles +web/App_Themes/style.totem.css +web/Web.Debug.config +web/Web.Release.config +web/Web.Lua.config .nuget .gitignore -web/bfiles -web/App_Themes/style.totem.css + diff --git a/ChangeLog b/ChangeLog index aadc4df3..8c8064aa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2015-11-19 Paul Schneider + + * .gitignore: ignore my new config transformation sources + + * Makefile: instead of `deploy`, start Xsp, in the `dist` + folder + + * Yavsc.sln: Lua config + 2015-11-18 Paul Schneider * Makefile: adds my deployment targets diff --git a/ITContentProvider/ChangeLog b/ITContentProvider/ChangeLog new file mode 100644 index 00000000..cc66052e --- /dev/null +++ b/ITContentProvider/ChangeLog @@ -0,0 +1,4 @@ +2015-11-19 Paul Schneider + + * ITContentProvider.csproj: adds a build target named "Lua" + diff --git a/ITContentProvider/ITContentProvider.csproj b/ITContentProvider/ITContentProvider.csproj index dfe8b503..3b3de86f 100644 --- a/ITContentProvider/ITContentProvider.csproj +++ b/ITContentProvider/ITContentProvider.csproj @@ -21,6 +21,7 @@ 4 false bin\Debug\ITContentProvider.xml + v4.5 full @@ -29,6 +30,12 @@ prompt 4 false + v4.5 + + + false + bin\Lua + 4 diff --git a/Makefile b/Makefile index 12a2f483..9482a98a 100644 --- a/Makefile +++ b/Makefile @@ -37,16 +37,14 @@ ddir: deploy: ddir build rm -rf $(LYDESTDIR) 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)!" + echo "!Deploying to $(HOST) using $(CONFIG) config!" $(RSYNCCMD) dist/web/$(CONFIG)/ root@$(HOST):$(DESTDIR) - ssh root@$(HOST) "service apache2 reload" build: xbuild /p:Configuration=$(CONFIG) /t:Build Yavsc.sln @@ -61,8 +59,8 @@ distclean: clean sourcepkg: git archive --format=tar --prefix=yavsc-$(CONFIG)/ $(CONFIG) | bzip2 > yavsc-$(CONFIG).tar.bz2 -debug: build - (cd web; export MONO_OPTIONS=--debug; xsp4 --port 8080) +start_xsp: deploy + (cd $(LDYDESTDIR); export MONO_OPTIONS=--debug; xsp4 --port 8080) xmldoc: $(patsubst %,web/bin/%,$(DOCASSBS)) mdoc-update $^ $(patsubst %.dll,-i%.xml,$^) --out web/xmldoc @@ -73,7 +71,7 @@ htmldoc: xmldoc docdeploy-prod: htmldoc rsync -ravu web/htmldoc root@$(PRODHOSTDIR) -rsync_lua: +rsync_lua: CONFIG = Lua rsync_yavsc: diff --git a/NpgsqlBlogProvider/ChangeLog b/NpgsqlBlogProvider/ChangeLog index 073ce25d..60b3e728 100644 --- a/NpgsqlBlogProvider/ChangeLog +++ b/NpgsqlBlogProvider/ChangeLog @@ -1,3 +1,7 @@ +2015-11-19 Paul Schneider + + * NpgsqlBlogProvider.csproj: adds a build target named "Lua" + 2015-11-14 Paul Schneider * NpgsqlBlogProvider.cs: Bill ranking, and delivering hidden diff --git a/NpgsqlBlogProvider/NpgsqlBlogProvider.csproj b/NpgsqlBlogProvider/NpgsqlBlogProvider.csproj index 82c92432..92bf7b61 100644 --- a/NpgsqlBlogProvider/NpgsqlBlogProvider.csproj +++ b/NpgsqlBlogProvider/NpgsqlBlogProvider.csproj @@ -21,6 +21,7 @@ 4 false bin\Debug\NpgsqlBlogProvider.xml + v4.5 none @@ -29,6 +30,12 @@ prompt 4 false + v4.5 + + + false + bin\Lua + 4 diff --git a/NpgsqlContentProvider/ChangeLog b/NpgsqlContentProvider/ChangeLog index c7cae7ea..9b139afa 100644 --- a/NpgsqlContentProvider/ChangeLog +++ b/NpgsqlContentProvider/ChangeLog @@ -1,3 +1,8 @@ +2015-11-19 Paul Schneider + + * NpgsqlContentProvider.csproj: adds a build target named + "Lua" + 2015-11-17 Paul Schneider * NpgsqlSkillProvider.cs: User's skills profile object now diff --git a/NpgsqlContentProvider/NpgsqlContentProvider.csproj b/NpgsqlContentProvider/NpgsqlContentProvider.csproj index 9b443b14..ee1609f9 100644 --- a/NpgsqlContentProvider/NpgsqlContentProvider.csproj +++ b/NpgsqlContentProvider/NpgsqlContentProvider.csproj @@ -21,6 +21,7 @@ 4 false bin\Debug\WorkFlowProvider.xml + v4.5 full @@ -29,6 +30,12 @@ prompt 4 false + v4.5 + + + false + bin\Lua + 4 diff --git a/NpgsqlMRPProviders/ChangeLog b/NpgsqlMRPProviders/ChangeLog index 62c1c1c4..72569c06 100644 --- a/NpgsqlMRPProviders/ChangeLog +++ b/NpgsqlMRPProviders/ChangeLog @@ -1,3 +1,7 @@ +2015-11-19 Paul Schneider + + * NpgsqlMRPProviders.csproj: adds a build target named "Lua" + 2015-11-11 Paul Schneider * NpgsqlProfileProvider.cs: return the default value in the diff --git a/NpgsqlMRPProviders/NpgsqlMRPProviders.csproj b/NpgsqlMRPProviders/NpgsqlMRPProviders.csproj index d776ed2a..2b7112eb 100644 --- a/NpgsqlMRPProviders/NpgsqlMRPProviders.csproj +++ b/NpgsqlMRPProviders/NpgsqlMRPProviders.csproj @@ -21,6 +21,7 @@ 4 false bin\Debug\NpgsqlMRPProviders.xml + v4.5 none @@ -29,6 +30,12 @@ prompt 4 false + v4.5 + + + false + bin\Lua + 4 diff --git a/Presta/ChangeLog b/Presta/ChangeLog index 07f63e20..29f95d41 100644 --- a/Presta/ChangeLog +++ b/Presta/ChangeLog @@ -1,3 +1,7 @@ +2015-11-19 Paul Schneider + + * Presta.csproj: adds a build target named "Lua" + 2015-08-20 Paul Schneider * Presta.csproj: The new `Presta` project ... diff --git a/Presta/Presta.csproj b/Presta/Presta.csproj index fd631d3e..c9005871 100644 --- a/Presta/Presta.csproj +++ b/Presta/Presta.csproj @@ -20,6 +20,7 @@ prompt 4 false + v4.5 full @@ -28,6 +29,12 @@ prompt 4 false + v4.5 + + + false + bin\Lua + 4 diff --git a/SalesCatalog/ChangeLog b/SalesCatalog/ChangeLog index b993ca35..8434bb30 100644 --- a/SalesCatalog/ChangeLog +++ b/SalesCatalog/ChangeLog @@ -1,3 +1,7 @@ +2015-11-19 Paul Schneider + + * SalesCatalog.csproj: adds a build target named "Lua" + 2015-11-04 Paul Schneider * TestCatalogInit.cs: diff --git a/SalesCatalog/SalesCatalog.csproj b/SalesCatalog/SalesCatalog.csproj index a449bd35..7dcb9610 100644 --- a/SalesCatalog/SalesCatalog.csproj +++ b/SalesCatalog/SalesCatalog.csproj @@ -21,6 +21,7 @@ 4 false bin\Debug\SalesCatalog.xml + v4.5 none @@ -29,6 +30,12 @@ prompt 4 false + v4.5 + + + false + bin\Lua + 4 diff --git a/TestAPI/ChangeLog b/TestAPI/ChangeLog index 9c11fcf8..66eb25ca 100644 --- a/TestAPI/ChangeLog +++ b/TestAPI/ChangeLog @@ -1,3 +1,7 @@ +2015-11-19 Paul Schneider + + * TestAPI.csproj: adds a build target named "Lua" + 2015-11-14 Paul Schneider * TestAPI.csproj: nothing to view diff --git a/TestAPI/TestAPI.csproj b/TestAPI/TestAPI.csproj index a3b0eeef..a10e578b 100644 --- a/TestAPI/TestAPI.csproj +++ b/TestAPI/TestAPI.csproj @@ -20,6 +20,7 @@ prompt 4 false + v4.5.1 full @@ -28,6 +29,12 @@ prompt 4 false + v4.5.1 + + + false + bin\Lua + 4 diff --git a/WebControls/ChangeLog b/WebControls/ChangeLog index ab0aaaf5..21f990ed 100644 --- a/WebControls/ChangeLog +++ b/WebControls/ChangeLog @@ -1,3 +1,7 @@ +2015-11-19 Paul Schneider + + * WebControls.csproj: Lua config + 2015-11-17 Paul Schneider * RateControl.cs: refactorization diff --git a/WebControls/WebControls.csproj b/WebControls/WebControls.csproj index 9a4b4a0c..f725dc32 100644 --- a/WebControls/WebControls.csproj +++ b/WebControls/WebControls.csproj @@ -8,8 +8,8 @@ {59E1DF7B-FFA0-4DEB-B5F3-76EBD98D5356} Library WebControls - Yavsc.WebControls v4.5 + Yavsc.WebControls true @@ -30,6 +30,11 @@ 4 false + + false + bin\Lua + 4 + diff --git a/Yavsc.sln b/Yavsc.sln index c958fc27..e65a0921 100644 --- a/Yavsc.sln +++ b/Yavsc.sln @@ -40,56 +40,80 @@ Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU Release|Any CPU = Release|Any CPU + Lua|Any CPU = Lua|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {42B77C89-BF6D-4DB1-8763-6197F4030A95}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {42B77C89-BF6D-4DB1-8763-6197F4030A95}.Debug|Any CPU.Build.0 = Debug|Any CPU + {42B77C89-BF6D-4DB1-8763-6197F4030A95}.Lua|Any CPU.ActiveCfg = Lua|Any CPU {42B77C89-BF6D-4DB1-8763-6197F4030A95}.Release|Any CPU.ActiveCfg = Release|Any CPU {42B77C89-BF6D-4DB1-8763-6197F4030A95}.Release|Any CPU.Build.0 = Release|Any CPU {59E1DF7B-FFA0-4DEB-B5F3-76EBD98D5356}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {59E1DF7B-FFA0-4DEB-B5F3-76EBD98D5356}.Debug|Any CPU.Build.0 = Debug|Any CPU + {59E1DF7B-FFA0-4DEB-B5F3-76EBD98D5356}.Lua|Any CPU.ActiveCfg = Lua|Any CPU + {59E1DF7B-FFA0-4DEB-B5F3-76EBD98D5356}.Lua|Any CPU.Build.0 = Lua|Any CPU {59E1DF7B-FFA0-4DEB-B5F3-76EBD98D5356}.Release|Any CPU.ActiveCfg = Release|Any CPU {59E1DF7B-FFA0-4DEB-B5F3-76EBD98D5356}.Release|Any CPU.Build.0 = Release|Any CPU {68F5B80A-616E-4C3C-91A0-828AA40000BD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {68F5B80A-616E-4C3C-91A0-828AA40000BD}.Debug|Any CPU.Build.0 = Debug|Any CPU + {68F5B80A-616E-4C3C-91A0-828AA40000BD}.Lua|Any CPU.ActiveCfg = Lua|Any CPU + {68F5B80A-616E-4C3C-91A0-828AA40000BD}.Lua|Any CPU.Build.0 = Lua|Any CPU {68F5B80A-616E-4C3C-91A0-828AA40000BD}.Release|Any CPU.ActiveCfg = Release|Any CPU {68F5B80A-616E-4C3C-91A0-828AA40000BD}.Release|Any CPU.Build.0 = Release|Any CPU {6A312228-9641-478D-916F-4681CC65A35D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {6A312228-9641-478D-916F-4681CC65A35D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {6A312228-9641-478D-916F-4681CC65A35D}.Lua|Any CPU.ActiveCfg = Lua|Any CPU + {6A312228-9641-478D-916F-4681CC65A35D}.Lua|Any CPU.Build.0 = Lua|Any CPU {6A312228-9641-478D-916F-4681CC65A35D}.Release|Any CPU.ActiveCfg = Release|Any CPU {6A312228-9641-478D-916F-4681CC65A35D}.Release|Any CPU.Build.0 = Release|Any CPU {77044C92-D2F1-45BD-80DD-AA25B311B027}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {77044C92-D2F1-45BD-80DD-AA25B311B027}.Debug|Any CPU.Build.0 = Debug|Any CPU + {77044C92-D2F1-45BD-80DD-AA25B311B027}.Lua|Any CPU.ActiveCfg = Lua|Any CPU + {77044C92-D2F1-45BD-80DD-AA25B311B027}.Lua|Any CPU.Build.0 = Lua|Any CPU {77044C92-D2F1-45BD-80DD-AA25B311B027}.Release|Any CPU.ActiveCfg = Release|Any CPU {77044C92-D2F1-45BD-80DD-AA25B311B027}.Release|Any CPU.Build.0 = Release|Any CPU {821FF72D-9F4B-4A2C-B95C-7B965291F119}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {821FF72D-9F4B-4A2C-B95C-7B965291F119}.Debug|Any CPU.Build.0 = Debug|Any CPU + {821FF72D-9F4B-4A2C-B95C-7B965291F119}.Lua|Any CPU.ActiveCfg = Lua|Any CPU + {821FF72D-9F4B-4A2C-B95C-7B965291F119}.Lua|Any CPU.Build.0 = Lua|Any CPU {821FF72D-9F4B-4A2C-B95C-7B965291F119}.Release|Any CPU.ActiveCfg = Release|Any CPU {821FF72D-9F4B-4A2C-B95C-7B965291F119}.Release|Any CPU.Build.0 = Release|Any CPU {90BF2234-7252-4CD5-B2A4-17501B19279B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {90BF2234-7252-4CD5-B2A4-17501B19279B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {90BF2234-7252-4CD5-B2A4-17501B19279B}.Lua|Any CPU.ActiveCfg = Lua|Any CPU + {90BF2234-7252-4CD5-B2A4-17501B19279B}.Lua|Any CPU.Build.0 = Lua|Any CPU {90BF2234-7252-4CD5-B2A4-17501B19279B}.Release|Any CPU.ActiveCfg = Release|Any CPU {90BF2234-7252-4CD5-B2A4-17501B19279B}.Release|Any CPU.Build.0 = Release|Any CPU {9D7D892E-9B77-4713-892D-C26E1E944119}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {9D7D892E-9B77-4713-892D-C26E1E944119}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9D7D892E-9B77-4713-892D-C26E1E944119}.Lua|Any CPU.ActiveCfg = Lua|Any CPU + {9D7D892E-9B77-4713-892D-C26E1E944119}.Lua|Any CPU.Build.0 = Lua|Any CPU {9D7D892E-9B77-4713-892D-C26E1E944119}.Release|Any CPU.ActiveCfg = Release|Any CPU {9D7D892E-9B77-4713-892D-C26E1E944119}.Release|Any CPU.Build.0 = Release|Any CPU {B5F49C21-7BB3-4DC0-AE65-F4ED0F6D15BD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {B5F49C21-7BB3-4DC0-AE65-F4ED0F6D15BD}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B5F49C21-7BB3-4DC0-AE65-F4ED0F6D15BD}.Lua|Any CPU.ActiveCfg = Lua|Any CPU {B5F49C21-7BB3-4DC0-AE65-F4ED0F6D15BD}.Release|Any CPU.ActiveCfg = Release|Any CPU {B5F49C21-7BB3-4DC0-AE65-F4ED0F6D15BD}.Release|Any CPU.Build.0 = Release|Any CPU {BBA7175D-7F92-4278-96FC-84C495A2B5A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {BBA7175D-7F92-4278-96FC-84C495A2B5A6}.Debug|Any CPU.Build.0 = Debug|Any CPU + {BBA7175D-7F92-4278-96FC-84C495A2B5A6}.Lua|Any CPU.ActiveCfg = Lua|Any CPU + {BBA7175D-7F92-4278-96FC-84C495A2B5A6}.Lua|Any CPU.Build.0 = Lua|Any CPU {BBA7175D-7F92-4278-96FC-84C495A2B5A6}.Release|Any CPU.ActiveCfg = Release|Any CPU {BBA7175D-7F92-4278-96FC-84C495A2B5A6}.Release|Any CPU.Build.0 = Release|Any CPU {C6DBD1DC-B619-4DC7-BC92-15693508541E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C6DBD1DC-B619-4DC7-BC92-15693508541E}.Lua|Any CPU.ActiveCfg = Lua|Any CPU {C6DBD1DC-B619-4DC7-BC92-15693508541E}.Release|Any CPU.ActiveCfg = Release|Any CPU {C6E9E91B-97D3-48D9-8AA7-05356929E162}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {C6E9E91B-97D3-48D9-8AA7-05356929E162}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C6E9E91B-97D3-48D9-8AA7-05356929E162}.Lua|Any CPU.ActiveCfg = Lua|Any CPU + {C6E9E91B-97D3-48D9-8AA7-05356929E162}.Lua|Any CPU.Build.0 = Lua|Any CPU {C6E9E91B-97D3-48D9-8AA7-05356929E162}.Release|Any CPU.ActiveCfg = Release|Any CPU {C6E9E91B-97D3-48D9-8AA7-05356929E162}.Release|Any CPU.Build.0 = Release|Any CPU {EEFCECE6-3B7F-4BBE-B7AF-69377AF3CF39}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {EEFCECE6-3B7F-4BBE-B7AF-69377AF3CF39}.Debug|Any CPU.Build.0 = Debug|Any CPU + {EEFCECE6-3B7F-4BBE-B7AF-69377AF3CF39}.Lua|Any CPU.ActiveCfg = Lua|Any CPU + {EEFCECE6-3B7F-4BBE-B7AF-69377AF3CF39}.Lua|Any CPU.Build.0 = Lua|Any CPU {EEFCECE6-3B7F-4BBE-B7AF-69377AF3CF39}.Release|Any CPU.ActiveCfg = Release|Any CPU {EEFCECE6-3B7F-4BBE-B7AF-69377AF3CF39}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection diff --git a/pkg/ChangeLog b/pkg/ChangeLog index 6a206c78..ac4c0ae0 100644 --- a/pkg/ChangeLog +++ b/pkg/ChangeLog @@ -1,3 +1,7 @@ +2015-11-19 Paul Schneider + + * pkg.mdproj: adds a build target named "Lua" + 2015-06-09 Paul Schneider * pkg.mdproj: drops the Web tarball diff --git a/pkg/pkg.mdproj b/pkg/pkg.mdproj index 9e6e7815..273c46e0 100644 --- a/pkg/pkg.mdproj +++ b/pkg/pkg.mdproj @@ -20,5 +20,7 @@ + Lua + AnyCPU \ No newline at end of file diff --git a/plugins/fortune/ChangeLog b/plugins/fortune/ChangeLog index 5e39aefc..e212f9d0 100644 --- a/plugins/fortune/ChangeLog +++ b/plugins/fortune/ChangeLog @@ -1,3 +1,7 @@ +2015-11-19 Paul Schneider + + * fortune.csproj: adds a build target named "Lua" + 2015-08-04 Paul Schneider * MyClass.cs: refactoring from Yavsc.Model diff --git a/plugins/fortune/fortune.csproj b/plugins/fortune/fortune.csproj index ca7bae6c..55dadda6 100644 --- a/plugins/fortune/fortune.csproj +++ b/plugins/fortune/fortune.csproj @@ -20,6 +20,7 @@ prompt 4 false + v4.5 full @@ -28,6 +29,12 @@ prompt 4 false + v4.5 + + + false + bin\Lua + 4 diff --git a/web/App_Data/Sql/Skills.sql b/web/App_Code/Sql/Skills.sql similarity index 100% rename from web/App_Data/Sql/Skills.sql rename to web/App_Code/Sql/Skills.sql diff --git a/web/App_Data/Sql/instdbws.sql b/web/App_Code/Sql/instdbws.sql similarity index 100% rename from web/App_Data/Sql/instdbws.sql rename to web/App_Code/Sql/instdbws.sql diff --git a/web/ChangeLog b/web/ChangeLog index 0550266f..53a4664a 100644 --- a/web/ChangeLog +++ b/web/ChangeLog @@ -1,3 +1,30 @@ +2015-11-19 Paul Schneider + + * PayPalController.cs: implements a Paypal controller + + * Abort.aspx: Paypal paiement aborting page + + * Commit.aspx: Paypal paiement commit page + + * IPN.aspx: Paypal paiement notification page + + * Index.aspx: Paypal paiement form page + + * WebTasks.dll: thanks to he Marcelo Zabani's coding blog: + + + + * yavsc.rate.js: refactoring, still needs a cleanning + + * RateSkillControl.ascx: give it the `rate-site-skill` + `data-type` html attribute + + * RateUserSkillControl.ascx: cleans an obsolete code chunk + + * Web.csproj: Fixes the missing RateSkillControl at deploy + time, + adds my deployment config + 2015-11-18 Paul Schneider * style.css: this floating breaks my dark style diff --git a/web/Controllers/PayPalController.cs b/web/Controllers/PayPalController.cs new file mode 100644 index 00000000..c6e213b8 --- /dev/null +++ b/web/Controllers/PayPalController.cs @@ -0,0 +1,43 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.Mvc; + +namespace Yavsc.Controllers +{ + /// + /// Pay pal controller. + /// + public class PayPalController : Controller + { + /// + /// Index this instance. + /// + public ActionResult Index() + { + return View (); + } + /// + /// Commit this instance. + /// + public ActionResult Commit() + { + return View (); + } + /// + /// Abort this instance. + /// + public ActionResult Abort() + { + return View (); + } + /// + /// IP this instance. + /// + public ActionResult IPN() + { + return View (); + } + } +} diff --git a/web/Scripts/yavsc.rate.js b/web/Scripts/yavsc.rate.js index bed6b5f4..58f22d96 100644 --- a/web/Scripts/yavsc.rate.js +++ b/web/Scripts/yavsc.rate.js @@ -51,7 +51,7 @@ }).call(this); $(document).ready(function(){ - $('[data-type="rate-skill"]').rate({target: 'Skill/RateSkill'}); + $('[data-type="rate-site-skill"]').rate({target: 'Skill/RateSkill'}); $('[data-type="rate-user-skill"]').rate({target: 'Skill/RateUserSkill'}); $('[data-type="rate-bill"]').rate({target: 'Blogs/Rate'}); }); diff --git a/web/Views/FrontOffice/RateSkillControl.ascx b/web/Views/FrontOffice/RateSkillControl.ascx index d61cc1e4..c0f60c45 100644 --- a/web/Views/FrontOffice/RateSkillControl.ascx +++ b/web/Views/FrontOffice/RateSkillControl.ascx @@ -1,7 +1,6 @@ <%@ Control Language="C#" Inherits="Yavsc.RateControl" %> -<% Rate = Model.Rate; %> -
<% int i = 0; for (; i<% int i = 0; for (; i<% } %><% if (HasHalf) { %><% i++; } %><% for (int j=0; j<% } -%>
\ No newline at end of file +%> diff --git a/web/Views/FrontOffice/RateUserSkillControl.ascx b/web/Views/FrontOffice/RateUserSkillControl.ascx index 718b22ea..7ff14393 100644 --- a/web/Views/FrontOffice/RateUserSkillControl.ascx +++ b/web/Views/FrontOffice/RateUserSkillControl.ascx @@ -1,5 +1,4 @@ <%@ Control Language="C#" Inherits="Yavsc.RateControl" %> -<% Rate = Model.Rate; %>
<% int i = 0; for (; i<% } %><% if (HasHalf) { %><% i++; } diff --git a/web/Views/FrontOffice/Skills.aspx b/web/Views/FrontOffice/Skills.aspx index 7fcac761..f14932cf 100644 --- a/web/Views/FrontOffice/Skills.aspx +++ b/web/Views/FrontOffice/Skills.aspx @@ -18,10 +18,10 @@ diff --git a/web/Views/PayPal/Abort.aspx b/web/Views/PayPal/Abort.aspx new file mode 100644 index 00000000..a7ccf164 --- /dev/null +++ b/web/Views/PayPal/Abort.aspx @@ -0,0 +1,11 @@ +<%@ Page Language="C#" MasterPageFile="~/Models/App.master" Inherits="System.Web.Mvc.ViewPage" %> + + + + + + + + + + diff --git a/web/Views/PayPal/Commit.aspx b/web/Views/PayPal/Commit.aspx new file mode 100644 index 00000000..a7ccf164 --- /dev/null +++ b/web/Views/PayPal/Commit.aspx @@ -0,0 +1,11 @@ +<%@ Page Language="C#" MasterPageFile="~/Models/App.master" Inherits="System.Web.Mvc.ViewPage" %> + + + + + + + + + + diff --git a/web/Views/PayPal/IPN.aspx b/web/Views/PayPal/IPN.aspx new file mode 100644 index 00000000..a7ccf164 --- /dev/null +++ b/web/Views/PayPal/IPN.aspx @@ -0,0 +1,11 @@ +<%@ Page Language="C#" MasterPageFile="~/Models/App.master" Inherits="System.Web.Mvc.ViewPage" %> + + + + + + + + + + diff --git a/web/Views/PayPal/Index.aspx b/web/Views/PayPal/Index.aspx new file mode 100644 index 00000000..d1511415 --- /dev/null +++ b/web/Views/PayPal/Index.aspx @@ -0,0 +1,22 @@ +<%@ Page Language="C#" MasterPageFile="~/Models/App.master" Inherits="System.Web.Mvc.ViewPage" %> + + + +
+ + + + +
note
+ + +
+ + diff --git a/web/Web.config b/web/Web.config index c0f04b66..392e5b82 100644 --- a/web/Web.config +++ b/web/Web.config @@ -7,272 +7,272 @@ http://www.mono-project.com/Config_system.web and http://msdn2.microsoft.com/en-us/library/b5ysx397.aspx --> - - - -
- -
-
-
-
- - - -
- -
-
-
-
-
-
-
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - - - - - - + + - - - - - - - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + \ No newline at end of file diff --git a/web/Web.csproj b/web/Web.csproj index 8c0bcd2c..09cfaae6 100644 --- a/web/Web.csproj +++ b/web/Web.csproj @@ -10,6 +10,7 @@ Library Yavsc v4.5.1 + Yavsc true @@ -22,7 +23,6 @@ - Yavsc @@ -38,15 +38,12 @@ prompt 4 false - Yavsc bin\Yavsc.xml - + false bin - DEBUG,TEST,WEBAPI 4 - maeweb @@ -105,6 +102,9 @@ ..\packages\log4net.2.0.4\lib\net45-full\log4net.dll + + ..\packages\Mono.Web.Xdt.1.0.0\lib\Net40\Microsoft.Web.XmlTransform.dll + @@ -115,7 +115,6 @@ - @@ -209,6 +208,7 @@ + @@ -489,6 +489,15 @@ + + + + + + + + + @@ -517,7 +526,9 @@ - + + + @@ -554,7 +565,7 @@ - + diff --git a/web/WebTasks.dll b/web/WebTasks.dll new file mode 100755 index 0000000000000000000000000000000000000000..5db7ef622265eb69c9ff4c765edfa9989fdfc5ff GIT binary patch literal 4608 zcmeHKU2Ggz6+U-%ZLc?usolhBN*l&FksM>KY~m`Un09TiK5DctAo(p?v4e zcz0tvNPRAMJ>NZl_uO;Ny>sV!{!1@XjELfRKKzjAE%e;dg8v(~pzi+Ejc)o`=R5sx zskwLha~rmARz0`mS!J_eRVr>^=C$e7DyCgAGf!pBvRl-t{ri(gBiD=5M01KGXtvvA z^zTy%q9kPPq5RLs(VKYEco`ceS?{Z0UMl4}$a5QHtY+jx3)CVWGm0~O|B~%$7WC)b@ii!2waKuqr(wn5UZ9PI$~Ub zi}=u|jo8g#&%7&;7sDjI}TlJD(@wBr=-qz)JLPQH6+C^3Y2P#=Q^>G)Y<3!2P6 zIjN$|xsDgdQX{DoBPT{rv9^sI;3DE0_&U+A(Epa{Y~b0IlFt_3LJ*jb29~pQ6*QNB zU}kwXgZ_u$-)DZ(aXCkBNbSCJ2Y;k^3(&vS3F-^$ejwDzd&&MV4IRXD7!R)tKP=;f zm_}jHZp4^o={TJR{s5Sy>-08t(?94A_0ofCSS4vmeMR+AS$UwZs%yX-f@h5lBT1J9 zUl#ni;4Q(w3dUk=b0l^$mZY<>Yw8SX1d^m6_O{F&M!+>x$o>#C4-2j6sPt=sSAdHq z4|x88Hxa#}^C6e`y&49$7IE*YQE+y|{RKLME=1fvp)=@m#KnwZROGpcyWbcEcU8FG z(13ALUK&MzBd*sr_7Kl~Sg>EPlM%tJCtTD8$Bv77)tOlQUB zi-MM*EqFn&F8B?>7X-ftd<{RIx1a8(PT-em0JH1^ouUHX!W3=N3eXq4BKS?g@6ywd zza;c4WP^U4t^t3HHBO7Si3r)}toU3Li4`HsZIN$@g7QG^4MLj<67Hf`vjOMeGHQOoXEPvCdoM%=1b=NDOFFQ1zb!%Qh zKeoBLI%yR)@!FoYwNs>7ww(=hnda?+=lbq?kP;uM)A)|*XIyWS#v7h?4Ij^FKd>uS zV7rxF$|ZfFW_!9g5#XH2*8)wcLg0Ed<(8|qqrDkj(Vi8w8f5D}Vo5F4DuG?rscp-w z_Ac55?bAiescAw&8Mja?>que!dKcXTuXg%V9%uNE(1t(F7Zu>%_cW^}$*Drs-hbDxp%&E%s~`^ zDDukl^0%Z=_6x4(*!g>JloWqpX}jX7qQf89m?^LGb3YmS<(;~o`{~$MzjO6ZTdz{A zy|)cI73X6BM0ea&s=LipMsE*L^&Csc0Re5?q~11`$q1vPBi7r~d(emvLcCv5VtYn> zIb}!}4zQVpWpie6j_9PK2U82vxkj;uqoRBP(LSOm*L|R&;`hO^>I*m|NMe{r3^?@A zj_@ZiXY`%(tm=YWnZ8uevNduW{8FgI^~YDA?fFCU(ZnwOqd!JwdiUUaO8Bcy^Z?P;-6r9!Xk-sL+dYBj zd>VJ6Fm)Dz9s{mWmR5n&v;=CFo}vZtv%u4!x&1o+_y2?^y`m4!ydgIr?jILz_+4mm zE7A;5!K+0c{Mfjc;k2R(t&=PIqw+P$L2E(kLvK+4I~N?cXX$$UAvjftDS(v?d1((% z|HAH2G=kqr_#UA#+)hygdI(ZQQ}9>DPh)g|S;BU-MOT&i>&Vs;yT}ChvrbrTN1lNP zAK!kCqk31I=b*_`4x@eC3c?xE^of?SE3ojOY34SH8^H*kN9c3tnH$BOWsFYX$8AjJ z=4u5pwgT@?ON4vPIfh%UqB+=?#F{g&Qe7f0(FQyb&A`VpHtP&6!jg#Zajj#*)hNP8 z89uy5J{(g9*KdXWz!fOTYH&>3_2CG)%0xS3OHmPad}vT~zg&b57t$K)8MI_2Cb;SI g?dEQqofR}g(~l1#;Vxu*TmHxS_@w>+Ov4KN7h0;i-~a#s literal 0 HcmV?d00001 diff --git a/web/packages.config b/web/packages.config index 7933d4b1..ea441a73 100644 --- a/web/packages.config +++ b/web/packages.config @@ -9,6 +9,7 @@ + diff --git a/yavscModel/ChangeLog b/yavscModel/ChangeLog index 707d87fe..2875730b 100644 --- a/yavscModel/ChangeLog +++ b/yavscModel/ChangeLog @@ -1,3 +1,7 @@ +2015-11-19 Paul Schneider + + * YavscModel.csproj: Lua config + 2015-11-17 Paul Schneider * PerformerProfile.cs: implements a performer profile diff --git a/yavscModel/YavscModel.csproj b/yavscModel/YavscModel.csproj index 04986a3e..c20f30d8 100644 --- a/yavscModel/YavscModel.csproj +++ b/yavscModel/YavscModel.csproj @@ -21,6 +21,7 @@ 4 false bin\Debug\YavscModel.xml + v4.5 full @@ -29,6 +30,12 @@ prompt 4 false + v4.5 + + + false + bin\Lua + 4 diff --git a/yavscclient/ChangeLog b/yavscclient/ChangeLog index f9032943..a6e82cf1 100644 --- a/yavscclient/ChangeLog +++ b/yavscclient/ChangeLog @@ -1,3 +1,7 @@ +2015-11-19 Paul Schneider + + * YavscClient.csproj: Lua config + 2015-11-06 Paul Schneider * ChangeLog: diff --git a/yavscclient/YavscClient.csproj b/yavscclient/YavscClient.csproj index a87c2220..c8800b62 100644 --- a/yavscclient/YavscClient.csproj +++ b/yavscclient/YavscClient.csproj @@ -22,6 +22,7 @@ false true bin\Debug\yavscclient.xml + v4.5 full @@ -31,6 +32,12 @@ 4 false true + v4.5 + + + false + bin\Lua + 4