# HG changeset patch # User ymh # Date 1364282878 -3600 # Node ID 4479369ff9f196ca8a65e98c5e9688d14c702f9f # Parent ea11e17e0a358adb4255df506046e70a922da75c# Parent 82fcd1c24cd89de74119b2e02c509f535a2d6c41 Merge with 70c5d6efd68d22258532fdad80e29aea91bb24ae diff -r ea11e17e0a35 -r 4479369ff9f1 server/src/main/webapp/WEB-INF/i18n/messages_en.properties --- a/server/src/main/webapp/WEB-INF/i18n/messages_en.properties Wed Apr 03 16:17:36 2013 +0200 +++ b/server/src/main/webapp/WEB-INF/i18n/messages_en.properties Tue Mar 26 08:27:58 2013 +0100 @@ -27,4 +27,16 @@ renkanIndex.space_proj_count = Renkan count -renkanIndex.js.empty_name_error = Please enter a title \ No newline at end of file +renkanIndex.js.empty_name_error = Please enter a title + +renkanAdmin.renkan_admin = Renkan administration +renkanAdmin.site_admin = Site administration + +renkanAdmin.object_list = {0} list + +renkanAdmin.object_name = Name +renkanAdmin.object_edit = Edit +renkanAdmin.object_delete = Delete +renkanAdmin.object_edit_link = Edit +renkanAdmin.object_delete_link = Del. + diff -r ea11e17e0a35 -r 4479369ff9f1 server/src/main/webapp/WEB-INF/i18n/messages_fr.properties --- a/server/src/main/webapp/WEB-INF/i18n/messages_fr.properties Wed Apr 03 16:17:36 2013 +0200 +++ b/server/src/main/webapp/WEB-INF/i18n/messages_fr.properties Tue Mar 26 08:27:58 2013 +0100 @@ -29,3 +29,14 @@ renkanIndex.js.empty_name_error = Veuillez entrer un titre +renkanAdmin.renkan_admin = Administration Renkan +renkanAdmin.site_admin = Administration site + +renkanAdmin.object_list = Liste de {0} + +renkanAdmin.object_name = Nom +renkanAdmin.object_edit = Modif. +renkanAdmin.object_delete = Eff. +renkanAdmin.object_edit_link = Modif. +renkanAdmin.object_delete_link = Eff. + diff -r ea11e17e0a35 -r 4479369ff9f1 server/src/main/webapp/WEB-INF/templates/admin/objectsList.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/server/src/main/webapp/WEB-INF/templates/admin/objectsList.html Tue Mar 26 08:27:58 2013 +0100 @@ -0,0 +1,75 @@ + + + + +${objectName} List + + + + Renkan Admin + + + + + + + + + + + + + +
+
+

Renkan administration

+
+
Create an object
+
+ + +
+
+

List of objects

+
+
+ << + < + ... + 2 + 3 + 4 + 5 + 6 + ... + > + >> +
+
+ + + + + + + + + + + + + + + + +
NameEditDelete
titleEditDelete
+ + + +
+ +
+ + \ No newline at end of file diff -r ea11e17e0a35 -r 4479369ff9f1 server/src/main/webapp/WEB-INF/templates/adminIndex.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/server/src/main/webapp/WEB-INF/templates/adminIndex.html Tue Mar 26 08:27:58 2013 +0100 @@ -0,0 +1,42 @@ + + + + Renkan Admin + + + + + + + + + + + + + +
+
+

Renkan administration

+

Site administration

+ + + + + + + + + + + + + +
Object 
titletitle
+
+ +
+ + \ No newline at end of file diff -r ea11e17e0a35 -r 4479369ff9f1 server/src/main/webapp/WEB-INF/templates/fragment/spaceForm.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/server/src/main/webapp/WEB-INF/templates/fragment/spaceForm.html Tue Mar 26 08:27:58 2013 +0100 @@ -0,0 +1,42 @@ + + + + +Space form + + +
+
+
+ +
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+ +
+ +
+ +
+
+
+ + \ No newline at end of file diff -r ea11e17e0a35 -r 4479369ff9f1 server/src/main/webapp/WEB-INF/templates/projectIndex.html --- a/server/src/main/webapp/WEB-INF/templates/projectIndex.html Wed Apr 03 16:17:36 2013 +0200 +++ b/server/src/main/webapp/WEB-INF/templates/projectIndex.html Tue Mar 26 08:27:58 2013 +0100 @@ -8,6 +8,10 @@ + + + + diff -r ea11e17e0a35 -r 4479369ff9f1 server/src/main/webapp/WEB-INF/templates/renkanIndex.html --- a/server/src/main/webapp/WEB-INF/templates/renkanIndex.html Wed Apr 03 16:17:36 2013 +0200 +++ b/server/src/main/webapp/WEB-INF/templates/renkanIndex.html Tue Mar 26 08:27:58 2013 +0100 @@ -8,6 +8,10 @@ + + + + diff -r ea11e17e0a35 -r 4479369ff9f1 server/src/main/webapp/WEB-INF/templates/renkanProjectEdit.html --- a/server/src/main/webapp/WEB-INF/templates/renkanProjectEdit.html Wed Apr 03 16:17:36 2013 +0200 +++ b/server/src/main/webapp/WEB-INF/templates/renkanProjectEdit.html Tue Mar 26 08:27:58 2013 +0100 @@ -27,7 +27,7 @@