Permalink
Browse files

Added images and login support

Added some images that not included. Added complete login supper with
ORM. Added dynamic config for start menu title.
  • Loading branch information...
jbalde committed Mar 7, 2012
1 parent fbdfa19 commit d480eabb24b95c43ceaec38b8c2ea0d0b744de73
Showing with 267 additions and 32 deletions.
  1. +171 −0 AltairStudios.Core/AltairStudios.Core.csproj
  2. +10 −3 AltairStudios.Core/Mvc/Controllers/AdminController.cs
  3. +2 −2 AltairStudios.Core/Orm/Model.cs
  4. +17 −3 AltairStudios.Core/Resources/Javascript/Desktop/App.js
  5. +2 −2 AltairStudios.Core/Resources/Javascript/Desktop/Settings.js
  6. +8 −4 AltairStudios.Core/Resources/Javascript/Login/App.js
  7. BIN AltairStudios.Core/bin/AltairStudios.Core.dll
  8. +17 −3 AltairStudios.Core/bin/Resources/Javascript/Desktop/App.js
  9. +2 −2 AltairStudios.Core/bin/Resources/Javascript/Desktop/Settings.js
  10. +8 −4 AltairStudios.Core/bin/Resources/Javascript/Login/App.js
  11. BIN AltairStudios.Core/bin/shared/icons/fam/accept.gif
  12. BIN AltairStudios.Core/bin/shared/icons/fam/accept.png
  13. BIN AltairStudios.Core/bin/shared/icons/fam/add.gif
  14. BIN AltairStudios.Core/bin/shared/icons/fam/add.png
  15. BIN AltairStudios.Core/bin/shared/icons/fam/application_go.png
  16. BIN AltairStudios.Core/bin/shared/icons/fam/application_view_list.png
  17. BIN AltairStudios.Core/bin/shared/icons/fam/book.png
  18. BIN AltairStudios.Core/bin/shared/icons/fam/cog.gif
  19. BIN AltairStudios.Core/bin/shared/icons/fam/cog.png
  20. BIN AltairStudios.Core/bin/shared/icons/fam/cog_edit.png
  21. BIN AltairStudios.Core/bin/shared/icons/fam/connect.gif
  22. BIN AltairStudios.Core/bin/shared/icons/fam/connect.png
  23. BIN AltairStudios.Core/bin/shared/icons/fam/control_rewind.png
  24. BIN AltairStudios.Core/bin/shared/icons/fam/cross.gif
  25. BIN AltairStudios.Core/bin/shared/icons/fam/delete.gif
  26. BIN AltairStudios.Core/bin/shared/icons/fam/error.gif
  27. BIN AltairStudios.Core/bin/shared/icons/fam/error.png
  28. BIN AltairStudios.Core/bin/shared/icons/fam/feed_add.png
  29. BIN AltairStudios.Core/bin/shared/icons/fam/feed_delete.png
  30. BIN AltairStudios.Core/bin/shared/icons/fam/feed_error.png
  31. BIN AltairStudios.Core/bin/shared/icons/fam/folder_go.gif
  32. BIN AltairStudios.Core/bin/shared/icons/fam/folder_go.png
  33. BIN AltairStudios.Core/bin/shared/icons/fam/folder_wrench.png
  34. BIN AltairStudios.Core/bin/shared/icons/fam/grid.png
  35. BIN AltairStudios.Core/bin/shared/icons/fam/image_add.png
  36. BIN AltairStudios.Core/bin/shared/icons/fam/information.png
  37. BIN AltairStudios.Core/bin/shared/icons/fam/plugin.gif
  38. BIN AltairStudios.Core/bin/shared/icons/fam/plugin_add.gif
  39. BIN AltairStudios.Core/bin/shared/icons/fam/rss_go.png
  40. BIN AltairStudios.Core/bin/shared/icons/fam/table_refresh.png
  41. BIN AltairStudios.Core/bin/shared/icons/fam/user.gif
  42. BIN AltairStudios.Core/bin/shared/icons/fam/user.png
  43. BIN AltairStudios.Core/bin/shared/icons/fam/user_add.gif
  44. BIN AltairStudios.Core/bin/shared/icons/fam/user_add.png
  45. BIN AltairStudios.Core/bin/shared/icons/fam/user_comment.png
  46. BIN AltairStudios.Core/bin/shared/icons/fam/user_delete.gif
  47. BIN AltairStudios.Core/bin/shared/icons/fam/user_delete.png
  48. BIN AltairStudios.Core/bin/shared/icons/fam/user_edit.png
  49. BIN AltairStudios.Core/bin/shared/icons/fam/user_female.gif
  50. BIN AltairStudios.Core/bin/shared/icons/fam/user_female.png
  51. BIN AltairStudios.Core/bin/shared/icons/fam/user_gray.png
  52. BIN AltairStudios.Core/bin/shared/icons/fam/user_green.gif
  53. BIN AltairStudios.Core/bin/shared/icons/fam/user_green.png
  54. BIN AltairStudios.Core/bin/shared/icons/fam/user_orange.png
  55. BIN AltairStudios.Core/bin/shared/icons/fam/user_red.png
  56. BIN AltairStudios.Core/bin/shared/icons/fam/user_suit.gif
  57. BIN AltairStudios.Core/bin/shared/icons/fam/user_suit.png
  58. BIN AltairStudios.Core/bin/wallpapers/Blue-Sencha.jpg
  59. BIN AltairStudios.Core/bin/wallpapers/Dark-Sencha.jpg
  60. BIN AltairStudios.Core/bin/wallpapers/Wood-Sencha.jpg
  61. BIN AltairStudios.Core/bin/wallpapers/blue.jpg
  62. BIN AltairStudios.Core/bin/wallpapers/desk.jpg
  63. BIN AltairStudios.Core/bin/wallpapers/desktop.jpg
  64. BIN AltairStudios.Core/bin/wallpapers/desktop2.jpg
  65. BIN AltairStudios.Core/bin/wallpapers/ext.gif
  66. BIN AltairStudios.Core/bin/wallpapers/shiny.gif
  67. BIN AltairStudios.Core/bin/wallpapers/sky.jpg
  68. +3 −0 AltairStudios.Core/shared/icons/fam/SILK.txt
  69. BIN AltairStudios.Core/shared/icons/fam/accept.gif
  70. BIN AltairStudios.Core/shared/icons/fam/accept.png
  71. BIN AltairStudios.Core/shared/icons/fam/add.gif
  72. BIN AltairStudios.Core/shared/icons/fam/add.png
  73. BIN AltairStudios.Core/shared/icons/fam/application_go.png
  74. BIN AltairStudios.Core/shared/icons/fam/application_view_list.png
  75. BIN AltairStudios.Core/shared/icons/fam/book.png
  76. BIN AltairStudios.Core/shared/icons/fam/cog.gif
  77. BIN AltairStudios.Core/shared/icons/fam/cog.png
  78. BIN AltairStudios.Core/shared/icons/fam/cog_edit.png
  79. BIN AltairStudios.Core/shared/icons/fam/connect.gif
  80. BIN AltairStudios.Core/shared/icons/fam/connect.png
  81. BIN AltairStudios.Core/shared/icons/fam/control_rewind.png
  82. BIN AltairStudios.Core/shared/icons/fam/cross.gif
  83. BIN AltairStudios.Core/shared/icons/fam/delete.gif
  84. BIN AltairStudios.Core/shared/icons/fam/error.gif
  85. BIN AltairStudios.Core/shared/icons/fam/error.png
  86. BIN AltairStudios.Core/shared/icons/fam/feed_add.png
  87. BIN AltairStudios.Core/shared/icons/fam/feed_delete.png
  88. BIN AltairStudios.Core/shared/icons/fam/feed_error.png
  89. BIN AltairStudios.Core/shared/icons/fam/folder_go.gif
  90. BIN AltairStudios.Core/shared/icons/fam/folder_go.png
  91. BIN AltairStudios.Core/shared/icons/fam/folder_wrench.png
  92. BIN AltairStudios.Core/shared/icons/fam/grid.png
  93. BIN AltairStudios.Core/shared/icons/fam/image_add.png
  94. BIN AltairStudios.Core/shared/icons/fam/information.png
  95. BIN AltairStudios.Core/shared/icons/fam/plugin.gif
  96. BIN AltairStudios.Core/shared/icons/fam/plugin_add.gif
  97. BIN AltairStudios.Core/shared/icons/fam/rss_go.png
  98. BIN AltairStudios.Core/shared/icons/fam/table_refresh.png
  99. BIN AltairStudios.Core/shared/icons/fam/user.gif
  100. BIN AltairStudios.Core/shared/icons/fam/user.png
  101. BIN AltairStudios.Core/shared/icons/fam/user_add.gif
  102. BIN AltairStudios.Core/shared/icons/fam/user_add.png
  103. BIN AltairStudios.Core/shared/icons/fam/user_comment.png
  104. BIN AltairStudios.Core/shared/icons/fam/user_delete.gif
  105. BIN AltairStudios.Core/shared/icons/fam/user_delete.png
  106. BIN AltairStudios.Core/shared/icons/fam/user_edit.png
  107. BIN AltairStudios.Core/shared/icons/fam/user_female.gif
  108. BIN AltairStudios.Core/shared/icons/fam/user_female.png
  109. BIN AltairStudios.Core/shared/icons/fam/user_gray.png
  110. BIN AltairStudios.Core/shared/icons/fam/user_green.gif
  111. BIN AltairStudios.Core/shared/icons/fam/user_green.png
  112. BIN AltairStudios.Core/shared/icons/fam/user_orange.png
  113. BIN AltairStudios.Core/shared/icons/fam/user_red.png
  114. BIN AltairStudios.Core/shared/icons/fam/user_suit.gif
  115. BIN AltairStudios.Core/shared/icons/fam/user_suit.png
  116. BIN AltairStudios.Core/wallpapers/Blue-Sencha.jpg
  117. BIN AltairStudios.Core/wallpapers/Dark-Sencha.jpg
  118. BIN AltairStudios.Core/wallpapers/Wood-Sencha.jpg
  119. BIN AltairStudios.Core/wallpapers/blue.jpg
  120. BIN AltairStudios.Core/wallpapers/desk.jpg
  121. BIN AltairStudios.Core/wallpapers/desktop.jpg
  122. BIN AltairStudios.Core/wallpapers/desktop2.jpg
  123. BIN AltairStudios.Core/wallpapers/ext.gif
  124. BIN AltairStudios.Core/wallpapers/shiny.gif
  125. BIN AltairStudios.Core/wallpapers/sky.jpg
  126. BIN Tests/Bin/AltairStudios.Core.dll
  127. BIN Tests/Bin/Tests.dll
  128. +17 −3 Tests/Bin/resources/javascript/Desktop/App.js
  129. +2 −2 Tests/Bin/resources/javascript/Desktop/Settings.js
  130. +8 −4 Tests/Bin/resources/javascript/Login/App.js
  131. BIN Tests/Bin/shared/icons/fam/accept.gif
  132. BIN Tests/Bin/shared/icons/fam/accept.png
  133. BIN Tests/Bin/shared/icons/fam/add.gif
  134. BIN Tests/Bin/shared/icons/fam/add.png
  135. BIN Tests/Bin/shared/icons/fam/application_go.png
  136. BIN Tests/Bin/shared/icons/fam/application_view_list.png
  137. BIN Tests/Bin/shared/icons/fam/book.png
  138. BIN Tests/Bin/shared/icons/fam/cog.gif
  139. BIN Tests/Bin/shared/icons/fam/cog.png
  140. BIN Tests/Bin/shared/icons/fam/cog_edit.png
  141. BIN Tests/Bin/shared/icons/fam/connect.gif
  142. BIN Tests/Bin/shared/icons/fam/connect.png
  143. BIN Tests/Bin/shared/icons/fam/control_rewind.png
  144. BIN Tests/Bin/shared/icons/fam/cross.gif
  145. BIN Tests/Bin/shared/icons/fam/delete.gif
  146. BIN Tests/Bin/shared/icons/fam/error.gif
  147. BIN Tests/Bin/shared/icons/fam/error.png
  148. BIN Tests/Bin/shared/icons/fam/feed_add.png
  149. BIN Tests/Bin/shared/icons/fam/feed_delete.png
  150. BIN Tests/Bin/shared/icons/fam/feed_error.png
  151. BIN Tests/Bin/shared/icons/fam/folder_go.gif
  152. BIN Tests/Bin/shared/icons/fam/folder_go.png
  153. BIN Tests/Bin/shared/icons/fam/folder_wrench.png
  154. BIN Tests/Bin/shared/icons/fam/grid.png
  155. BIN Tests/Bin/shared/icons/fam/image_add.png
  156. BIN Tests/Bin/shared/icons/fam/information.png
  157. BIN Tests/Bin/shared/icons/fam/plugin.gif
  158. BIN Tests/Bin/shared/icons/fam/plugin_add.gif
  159. BIN Tests/Bin/shared/icons/fam/rss_go.png
  160. BIN Tests/Bin/shared/icons/fam/table_refresh.png
  161. BIN Tests/Bin/shared/icons/fam/user.gif
  162. BIN Tests/Bin/shared/icons/fam/user.png
  163. BIN Tests/Bin/shared/icons/fam/user_add.gif
  164. BIN Tests/Bin/shared/icons/fam/user_add.png
  165. BIN Tests/Bin/shared/icons/fam/user_comment.png
  166. BIN Tests/Bin/shared/icons/fam/user_delete.gif
  167. BIN Tests/Bin/shared/icons/fam/user_delete.png
  168. BIN Tests/Bin/shared/icons/fam/user_edit.png
  169. BIN Tests/Bin/shared/icons/fam/user_female.gif
  170. BIN Tests/Bin/shared/icons/fam/user_female.png
  171. BIN Tests/Bin/shared/icons/fam/user_gray.png
  172. BIN Tests/Bin/shared/icons/fam/user_green.gif
  173. BIN Tests/Bin/shared/icons/fam/user_green.png
  174. BIN Tests/Bin/shared/icons/fam/user_orange.png
  175. BIN Tests/Bin/shared/icons/fam/user_red.png
  176. BIN Tests/Bin/shared/icons/fam/user_suit.gif
  177. BIN Tests/Bin/shared/icons/fam/user_suit.png
  178. BIN Tests/Bin/wallpapers/Blue-Sencha.jpg
  179. BIN Tests/Bin/wallpapers/Dark-Sencha.jpg
  180. BIN Tests/Bin/wallpapers/Wood-Sencha.jpg
  181. BIN Tests/Bin/wallpapers/blue.jpg
  182. BIN Tests/Bin/wallpapers/desk.jpg
  183. BIN Tests/Bin/wallpapers/desktop.jpg
  184. BIN Tests/Bin/wallpapers/desktop2.jpg
  185. BIN Tests/Bin/wallpapers/ext.gif
  186. BIN Tests/Bin/wallpapers/shiny.gif
  187. BIN Tests/Bin/wallpapers/sky.jpg
@@ -1337,5 +1337,176 @@
<Content Include="resources\javascript\Login\App.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
+ <Content Include="shared\icons\fam\accept.gif">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="shared\icons\fam\accept.png">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="shared\icons\fam\add.gif">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="shared\icons\fam\add.png">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="shared\icons\fam\application_go.png">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="shared\icons\fam\application_view_list.png">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="shared\icons\fam\book.png">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="shared\icons\fam\cog.gif">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="shared\icons\fam\cog.png">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="shared\icons\fam\cog_edit.png">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="shared\icons\fam\connect.gif">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="shared\icons\fam\connect.png">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="shared\icons\fam\control_rewind.png">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="shared\icons\fam\cross.gif">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="shared\icons\fam\delete.gif">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="shared\icons\fam\error.gif">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="shared\icons\fam\error.png">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="shared\icons\fam\feed_add.png">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="shared\icons\fam\feed_delete.png">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="shared\icons\fam\feed_error.png">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="shared\icons\fam\folder_go.gif">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="shared\icons\fam\folder_go.png">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="shared\icons\fam\folder_wrench.png">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="shared\icons\fam\grid.png">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="shared\icons\fam\image_add.png">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="shared\icons\fam\information.png">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="shared\icons\fam\plugin.gif">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="shared\icons\fam\plugin_add.gif">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="shared\icons\fam\rss_go.png">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="shared\icons\fam\table_refresh.png">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="shared\icons\fam\user.gif">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="shared\icons\fam\user.png">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="shared\icons\fam\user_add.gif">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="shared\icons\fam\user_add.png">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="shared\icons\fam\user_comment.png">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="shared\icons\fam\user_delete.gif">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="shared\icons\fam\user_delete.png">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="shared\icons\fam\user_edit.png">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="shared\icons\fam\user_female.gif">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="shared\icons\fam\user_female.png">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="shared\icons\fam\user_gray.png">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="shared\icons\fam\user_green.gif">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="shared\icons\fam\user_green.png">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="shared\icons\fam\user_orange.png">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="shared\icons\fam\user_red.png">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="shared\icons\fam\user_suit.gif">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="shared\icons\fam\user_suit.png">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="wallpapers\Blue-Sencha.jpg">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="wallpapers\Dark-Sencha.jpg">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="wallpapers\Wood-Sencha.jpg">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="wallpapers\blue.jpg">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="wallpapers\desk.jpg">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="wallpapers\desktop.jpg">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="wallpapers\desktop2.jpg">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="wallpapers\ext.gif">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="wallpapers\shiny.gif">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="wallpapers\sky.jpg">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
</ItemGroup>
</Project>
@@ -87,7 +87,7 @@ public class AdminController : Controller {
return Content(html.ToString());
}
-
+
public ActionResult Authorize(User user){
List<User> users = user.getBy<User>();
@@ -96,9 +96,10 @@ public class AdminController : Controller {
FormsAuthenticationTicket fat = new FormsAuthenticationTicket(user.Email, user.Remember, 30);
Response.Cookies.Add(new HttpCookie(FormsAuthentication.FormsCookieName, FormsAuthentication.Encrypt(fat)));
Session["admin_user"] = users[0];
+ return Content(users[0].ToJson());
+ } else {
+ return Content("{error:true}");
}
-
- return RedirectToAction("Index");
}
@@ -145,5 +146,11 @@ public class AdminController : Controller {
return Content(html.ToString());
}
+
+
+ [Authorize()]
+ public ActionResult GetUser() {
+ return Content(((User)Session["admin_user"]).ToJson());
+ }
}
}
@@ -21,7 +21,7 @@ public class Model : AltairStudios.Core.Mvc.Model {
//sql.Append(properties[i].Name + " = '" + properties[i].GetValue(this, null) + "' AND " );
TemplatizeAttribute[] attributes = (TemplatizeAttribute[])properties[i].GetCustomAttributes(typeof(TemplatizeAttribute), true);
- if(attributes[0].Templatize) {
+ if(attributes.Length > 0 && attributes[0].Templatize) {
sql.Append(properties[i].Name + " = @" + properties[i].Name + " AND " );
parameters.Add(properties[i]);
}
@@ -48,7 +48,7 @@ public class Model : AltairStudios.Core.Mvc.Model {
counter = 0;
for(int i = 0; i < properties.Length; i++) {
TemplatizeAttribute[] attributes = (TemplatizeAttribute[])properties[i].GetCustomAttributes(typeof(TemplatizeAttribute), true);
- if(attributes[0].Templatize) {
+ if(attributes.Length > 0 && attributes[0].Templatize) {
type.GetProperty(properties[i].Name).SetValue(instance, reader[counter], null);
counter++;
}
@@ -22,9 +22,23 @@ Ext.define('AdminDesktop.App', {
init: function() {
// custom logic before getXYZ methods get called...
-
- this.callParent();
+
+ this.callParent();
+
// now ready...
+ Ext.Ajax.request({
+ url: 'Admin/GetUser',
+ success: function (response) {
+ json = Ext.decode( response.responseText );
+
+ var menu = adminDesktop.getDesktop().taskbar.startMenu;
+ if (menu.rendered) {
+ menu.setTitle(json.Name + " " + json.Surname);
+ } else {
+ menu.title = json.Name + " " + json.Surname;
+ }
+ }
+ });
},
getModules : function(){
@@ -61,7 +75,7 @@ Ext.define('AdminDesktop.App', {
]
}),
- wallpaper: 'Content/wallpapers/Blue-Sencha.jpg',
+ wallpaper: 'Bin/wallpapers/Blue-Sencha.jpg',
wallpaperStretch: false
});
},
@@ -154,7 +154,7 @@ Ext.define('AdminDesktop.Settings', {
var me = this;
if (record.data.img) {
- me.selected = 'Content/wallpapers/' + record.data.img;
+ me.selected = 'Bin/wallpapers/' + record.data.img;
} else {
me.selected = Ext.BLANK_IMAGE_URL;
}
@@ -165,7 +165,7 @@ Ext.define('AdminDesktop.Settings', {
setInitialSelection: function () {
var s = this.desktop.getWallpaper();
if (s) {
- var path = 'Content/wallpapers/' + this.getTextOfWallpaper(s);
+ var path = 'Bin/wallpapers/' + this.getTextOfWallpaper(s);
this.tree.selectPath(path, 'text');
}
}
@@ -50,15 +50,19 @@ Ext.define('AdminDesktop.Login.App', {
Ext.Ajax.request({
url: 'Authorize',
success: function (response) {
- x = Ext.decode( response.responseText );
- alert(x);
- document.location = "Desktop";
+ json = Ext.decode( response.responseText );
+
+ if(json.error != null) {
+ return;
+ } else {
+ document.location = "../Admin";
+ }
},
failure: function () { console.log('failure');},
headers: {
'my-header': 'foo'
},
- params: { Name: Ext.getCmp('user').getValue(), Password: Ext.getCmp('password').getValue() }
+ params: { Email: Ext.getCmp('user').getValue(), Password: Ext.getCmp('password').getValue() }
});
}
}]
Binary file not shown.
@@ -22,9 +22,23 @@ Ext.define('AdminDesktop.App', {
init: function() {
// custom logic before getXYZ methods get called...
-
- this.callParent();
+
+ this.callParent();
+
// now ready...
+ Ext.Ajax.request({
+ url: 'Admin/GetUser',
+ success: function (response) {
+ json = Ext.decode( response.responseText );
+
+ var menu = adminDesktop.getDesktop().taskbar.startMenu;
+ if (menu.rendered) {
+ menu.setTitle(json.Name + " " + json.Surname);
+ } else {
+ menu.title = json.Name + " " + json.Surname;
+ }
+ }
+ });
},
getModules : function(){
@@ -61,7 +75,7 @@ Ext.define('AdminDesktop.App', {
]
}),
- wallpaper: 'Content/wallpapers/Blue-Sencha.jpg',
+ wallpaper: 'Bin/wallpapers/Blue-Sencha.jpg',
wallpaperStretch: false
});
},
@@ -154,7 +154,7 @@ Ext.define('AdminDesktop.Settings', {
var me = this;
if (record.data.img) {
- me.selected = 'Content/wallpapers/' + record.data.img;
+ me.selected = 'Bin/wallpapers/' + record.data.img;
} else {
me.selected = Ext.BLANK_IMAGE_URL;
}
@@ -165,7 +165,7 @@ Ext.define('AdminDesktop.Settings', {
setInitialSelection: function () {
var s = this.desktop.getWallpaper();
if (s) {
- var path = 'Content/wallpapers/' + this.getTextOfWallpaper(s);
+ var path = 'Bin/wallpapers/' + this.getTextOfWallpaper(s);
this.tree.selectPath(path, 'text');
}
}
@@ -50,15 +50,19 @@ Ext.define('AdminDesktop.Login.App', {
Ext.Ajax.request({
url: 'Authorize',
success: function (response) {
- x = Ext.decode( response.responseText );
- alert(x);
- document.location = "Desktop";
+ json = Ext.decode( response.responseText );
+
+ if(json.error != null) {
+ return;
+ } else {
+ document.location = "../Admin";
+ }
},
failure: function () { console.log('failure');},
headers: {
'my-header': 'foo'
},
- params: { Name: Ext.getCmp('user').getValue(), Password: Ext.getCmp('password').getValue() }
+ params: { Email: Ext.getCmp('user').getValue(), Password: Ext.getCmp('password').getValue() }
});
}
}]
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
@@ -0,0 +1,3 @@
+The icons in this folder are direct gif conversions of the fam fam fam silk icons.
+
+Please see http://www.famfamfam.com/lab/icons/silk/ for more details.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Binary file not shown.
View
Binary file not shown.
Oops, something went wrong.

0 comments on commit d480eab

Please sign in to comment.