From 597b674b74b997dff057340841979c6aaadec769 Mon Sep 17 00:00:00 2001 From: Paul Schneider Date: Sun, 14 Jun 2015 23:47:34 +0200 Subject: [PATCH] fixes the circle creation --- ...etApiController.cs => BasketController.cs} | 2 +- ...ogsApiController.cs => BlogsController.cs} | 0 ...ApiController.cs => CalendarController.cs} | 0 ...leApiController.cs => CircleController.cs} | 0 ...Controller.cs => FrontOfficeController.cs} | 2 +- web/Theme/dark/style.css | 44 ------------------- .../{FrontOffice => Account}/Register.ascx | 0 7 files changed, 2 insertions(+), 46 deletions(-) rename web/ApiControllers/{BasketApiController.cs => BasketController.cs} (97%) rename web/ApiControllers/{BlogsApiController.cs => BlogsController.cs} (100%) rename web/ApiControllers/{CalendarApiController.cs => CalendarController.cs} (100%) rename web/ApiControllers/{CircleApiController.cs => CircleController.cs} (100%) rename web/ApiControllers/{FrontOfficeApiController.cs => FrontOfficeController.cs} (99%) delete mode 100644 web/Theme/dark/style.css rename web/Views/{FrontOffice => Account}/Register.ascx (100%) diff --git a/web/ApiControllers/BasketApiController.cs b/web/ApiControllers/BasketController.cs similarity index 97% rename from web/ApiControllers/BasketApiController.cs rename to web/ApiControllers/BasketController.cs index f424cad9..b31cc91d 100644 --- a/web/ApiControllers/BasketApiController.cs +++ b/web/ApiControllers/BasketController.cs @@ -15,7 +15,7 @@ namespace Yavsc.ApiControllers /// Maintains a collection of articles /// qualified with name value pairs /// - public class BasketApiController : ApiController + public class BasketController : ApiController { /// /// The wfmgr. diff --git a/web/ApiControllers/BlogsApiController.cs b/web/ApiControllers/BlogsController.cs similarity index 100% rename from web/ApiControllers/BlogsApiController.cs rename to web/ApiControllers/BlogsController.cs diff --git a/web/ApiControllers/CalendarApiController.cs b/web/ApiControllers/CalendarController.cs similarity index 100% rename from web/ApiControllers/CalendarApiController.cs rename to web/ApiControllers/CalendarController.cs diff --git a/web/ApiControllers/CircleApiController.cs b/web/ApiControllers/CircleController.cs similarity index 100% rename from web/ApiControllers/CircleApiController.cs rename to web/ApiControllers/CircleController.cs diff --git a/web/ApiControllers/FrontOfficeApiController.cs b/web/ApiControllers/FrontOfficeController.cs similarity index 99% rename from web/ApiControllers/FrontOfficeApiController.cs rename to web/ApiControllers/FrontOfficeController.cs index 3e056d77..6068763c 100644 --- a/web/ApiControllers/FrontOfficeApiController.cs +++ b/web/ApiControllers/FrontOfficeController.cs @@ -184,7 +184,7 @@ namespace Yavsc.ApiControllers if (model.IsApprouved) if (!Roles.IsUserInRole ("Admin")) if (!Roles.IsUserInRole ("FrontOffice")) { - ModelState.AddModelError ("IsApprouved", + ModelState.AddModelError ("Register", "Since you're not member of Admin or FrontOffice groups, " + "you cannot ask for a pre-approuved registration"); return DefaultResponse (); diff --git a/web/Theme/dark/style.css b/web/Theme/dark/style.css deleted file mode 100644 index ebce5594..00000000 --- a/web/Theme/dark/style.css +++ /dev/null @@ -1,44 +0,0 @@ -/* tables */ -table.tablesorter { - font-family:arial; - background-color: #333; - margin:10px 0pt 15px; - font-size: 8pt; - text-align: left; -} -table.tablesorter thead tr th, table.tablesorter tfoot tr th { - background-color: rgba(0,0,0,0.5); - border: 1px solid #206; - font-size: 8pt; - padding: 4px; -} -table.tablesorter thead tr .header { - background-image: url(bg.gif); - background-repeat: no-repeat; - background-position: center right; - cursor: pointer; -} -table.tablesorter tbody td { - color: #ffa; - padding: 4px; - vertical-align: top; -} - -table.tablesorter .odd td { - background-color: rgba(0,0,32,0.5); -} - -table.tablesorter .even td { - background-color: rgba(16,0,16,0.5); -} - - -table.tablesorter thead tr .headerSortUp { - background-image: url(/Theme/dark/asc.gif); -} -table.tablesorter thead tr .headerSortDown { - background-image: url(/Theme/dark/desc.gif); -} -table.tablesorter thead tr .headerSortDown, table.tablesorter thead tr .headerSortUp { -background-color: #123; -} diff --git a/web/Views/FrontOffice/Register.ascx b/web/Views/Account/Register.ascx similarity index 100% rename from web/Views/FrontOffice/Register.ascx rename to web/Views/Account/Register.ascx