--- a/server/src/main/webapp/WEB-INF/i18n/messages_en.properties Fri Mar 15 10:38:05 2013 +0100
+++ b/server/src/main/webapp/WEB-INF/i18n/messages_en.properties Fri Mar 15 12:54:36 2013 +0100
@@ -8,15 +8,17 @@
renkanIndex.project_name = Name
renkanIndex.project_creation = Creation
renkanIndex.project_edit = Edit
-renkanIndex.project_render = Render
+renkanIndex.project_render = View
renkanIndex.project_edit_link = Edit project
-renkanIndex.project_render_link = render
+renkanIndex.project_render_link = View project
renkanIndex.space_exp = or create/open a space with the title
-renkanIndex.space_list = Spaces list
+renkanIndex.renkan_spaces = Renkan Spaces
+renkanIndex.renkan_space = Renkan Space
+renkanIndex.space_list = Space list
renkanIndex.space_name = Name
renkanIndex.space_title = Title
-renkanIndex.space_creation = Creation
+renkanIndex.space_creation = Creation date
renkanIndex.space_open = Open
renkanIndex.space_open_link = Open space
renkanIndex.space_proj_count = Proj. count
--- a/server/src/main/webapp/WEB-INF/i18n/messages_fr.properties Fri Mar 15 10:38:05 2013 +0100
+++ b/server/src/main/webapp/WEB-INF/i18n/messages_fr.properties Fri Mar 15 12:54:36 2013 +0100
@@ -14,7 +14,9 @@
renkanIndex.project_render_link = Consult. proj.
renkanIndex.space_exp = ou bien créer un espace avec le titre
-renkanIndex.space_list = Liste des espace
+renkanIndex.renkan_spaces = Espaces Renkan
+renkanIndex.renkan_space = Espace Renkan
+renkanIndex.space_list = Liste des espaces
renkanIndex.space_name = Nom
renkanIndex.space_title = Titre
renkanIndex.space_creation = Creation
--- a/server/src/main/webapp/WEB-INF/templates/projectIndex.html Fri Mar 15 10:38:05 2013 +0100
+++ b/server/src/main/webapp/WEB-INF/templates/projectIndex.html Fri Mar 15 12:54:36 2013 +0100
@@ -8,125 +8,15 @@
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=0"/>
<link rel="shortcut icon" href="favicon.ico"/>
- <script src="lib/jquery.min.js" th:src="@{/static/lib/jquery.min.js}" ></script>
- <script src="lib/underscore-min.js" th:src="@{/static/lib/underscore-min.js}" ></script>
- <script src="js/main.js" th:src="@{/static/js/main.js}" ></script>
+ <script src="../../lib/jquery.min.js" th:src="@{/static/lib/jquery.min.js}" ></script>
+ <script src="../../lib/underscore-min.js" th:src="@{/static/lib/underscore-min.js}" ></script>
+ <script src="../../js/main.js" th:src="@{/static/js/main.js}" ></script>
- <style>
- /*<![CDATA[*/
- body {
- margin: 0;
- height: 100%;
- color: #333;
- font: 14px helvetica, sans-serif;
- background: #ddd;
- background: -webkit-radial-gradient(circle,#aaa,#eee 60%) center fixed;
- background: -moz-radial-gradient(circle,#aaa,#eee 60%) center fixed;
- background: -ms-radial-gradient(circle,#aaa,#eee 60%) center fixed;
- background: -o-radial-gradient(circle,#aaa,#eee 60%) center fixed;
- border-top: 8px solid rgba(51,51,51,.8);
- }
- #wrapper {
- border-top: 1px solid #999;
- margin-top: 160px;
- padding: 15px;
- background: #eee;
- background: -webkit-linear-gradient(#fff,#ccc);
- background: -moz-linear-gradient(#fff,#ccc);
- background: -ms-linear-gradient(#fff,#ccc);
- background: -o-linear-gradient(#fff,#ccc);
- opacity: .9;
- box-shadow: 0px 1px 8px rgba(0,0,0,0.3);
- }
- #inner {
- width: 350px;
- margin: 0 auto;
- }
- #button {
- margin: 0 auto;
- border-radius: 3px;
- text-align: center;
- font: 36px verdana,arial,sans-serif;
- color: white;
- text-shadow: 0 -1px 0 rgba(0,0,0,.8);
- height: 70px;
- line-height: 70px;
- background: #555;
- background: -webkit-linear-gradient(#5F5F5F,#565656 50%,#4C4C4C 51%,#373737);
- background: -moz-linear-gradient(#5F5F5F,#565656 50%,#4C4C4C 51%,#373737);
- background: -ms-linear-gradient(#5F5F5F,#565656 50%,#4C4C4C 51%,#373737);
- background: -o-linear-gradient(#5F5F5F,#565656 50%,#4C4C4C 51%,#373737);
- box-shadow: inset 0 1px 3px rgba(0,0,0,0.9);
- }
- #button:hover {
- cursor: pointer;
- background: #666;
- background: -webkit-linear-gradient(#707070,#666666 50%,#5B5B5B 51%,#474747);
- background: -moz-linear-gradient(#707070,#666666 50%,#5B5B5B 51%,#474747);
- background: -ms-linear-gradient(#707070,#666666 50%,#5B5B5B 51%,#474747);
- background: -o-linear-gradient(#707070,#666666 50%,#5B5B5B 51%,#474747);
- }
- #button:active {
- box-shadow: inset 0 1px 12px rgba(0,0,0,0.9);
- background: #444;
- }
- #label {
- text-align: left;
- text-shadow: 0 1px 1px #fff;
- margin: 16px auto 0;
- }
- form {
- height: 38px;
- background: #fff;
- border: 1px solid #bbb;
- border-radius: 3px;
- position: relative;
- }
- button, input {
- font-weight: bold;
- font-size: 15px;
- }
- input[type="text"] {
- border-radius: 3px;
- box-sizing: border-box;
- -moz-box-sizing: border-box;
- padding: 0 45px 0 10px;
- *padding: 0; /* IE7 hack */
- width: 100%;
- height: 100%;
- outline: none;
- border: none;
- position: absolute;
- }
- button[type="submit"] {
- position: absolute;
- right: 0;
- width: 45px;
- height: 38px;
- }
- @media only screen and (min-device-width: 320px) and (max-device-width: 720px) {
- body {
- background: #bbb;
- background: -webkit-linear-gradient(#aaa,#eee 60%) center fixed;
- background: -moz-linear-gradient(#aaa,#eee 60%) center fixed;
- background: -ms-linear-gradient(#aaa,#eee 60%) center fixed;
- }
- #wrapper {
- margin-top: 0;
- }
- #inner {
- width: 95%;
- }
- #label {
- text-align: center;
- }
- }
- /*]]>*/
- </style>
- <link href="static/css/index.css" rel="stylesheet" th:href="@{/static/css/index.css}"/>
+ <link href="../../static/css/index.css" rel="stylesheet" th:href="@{/static/css/index.css}"/>
</head>
<body>
<div id="wrapper">
+ <h1><span th:text="#{renkanIndex.renkan_space}">Renkan Space</span>: <span th:text="${space.title}">Titre</span></h1>
<div id="inner">
<div id="button" onclick="go2Random()" class="translate" th:utext="#{renkanIndex.new_renkan}">New Renkan</div>
<div id="label" class="translate" th:text="#{renkanIndex.renkan_exp}">Create a Renkan with the title</div>
@@ -143,15 +33,15 @@
<th th:text="#{renkanIndex.project_name}">Name</th>
<th th:text="#{renkanIndex.project_creation}">Creation</th>
<th th:text="#{renkanIndex.project_edit}">Edit</th>
- <th th:text="#{renkanIndex.project_render}">render</th>
+ <th th:text="#{renkanIndex.project_render}">View</th>
</tr>
</thead>
<tbody>
<tr th:each="project: ${page}">
<th th:text="${project.title}">title</th>
<td th:text="${#dates.format(project.created, #messages.msg('date.format'))}">date</td>
- <td><a href="#" th:href="@{'/p/'+${project.id}(cowebkey=${project.getKey(2)})}" th:text="#{renkanIndex.project_edit_link}">Edit projet</a></td>
- <td><a href="#" th:href="@{'/p/pub/'+${project.id}(cowebkey=${project.getKey(1)})}" th:text="#{renkanIndex.project_render_link}">Render projet</a></td>
+ <td><a href="#" th:href="@{'/p/'+${project.id}(cowebkey=${project.getKey(2)})}" th:text="#{renkanIndex.project_edit_link}">Edit project</a></td>
+ <td><a href="#" th:href="@{'/p/pub/'+${project.id}(cowebkey=${project.getKey(1)})}" th:text="#{renkanIndex.project_render_link}">View project</a></td>
</tr>
</tbody>
</table>
--- a/server/src/main/webapp/WEB-INF/templates/renkanIndex.html Fri Mar 15 10:38:05 2013 +0100
+++ b/server/src/main/webapp/WEB-INF/templates/renkanIndex.html Fri Mar 15 12:54:36 2013 +0100
@@ -8,125 +8,15 @@
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=0"/>
<link rel="shortcut icon" href="favicon.ico"/>
- <script src="lib/jquery.min.js" th:src="@{/static/lib/jquery.min.js}" ></script>
- <script src="lib/underscore-min.js" th:src="@{/static/lib/underscore-min.js}" ></script>
- <script src="js/main.js" th:src="@{/static/js/main.js}" ></script>
+ <script src="../../lib/jquery.min.js" th:src="@{/static/lib/jquery.min.js}" ></script>
+ <script src="../../lib/underscore-min.js" th:src="@{/static/lib/underscore-min.js}" ></script>
+ <script src="../../js/main.js" th:src="@{/static/js/main.js}" ></script>
- <style>
- /*<![CDATA[*/
- body {
- margin: 0;
- height: 100%;
- color: #333;
- font: 14px helvetica, sans-serif;
- background: #ddd;
- background: -webkit-radial-gradient(circle,#aaa,#eee 60%) center fixed;
- background: -moz-radial-gradient(circle,#aaa,#eee 60%) center fixed;
- background: -ms-radial-gradient(circle,#aaa,#eee 60%) center fixed;
- background: -o-radial-gradient(circle,#aaa,#eee 60%) center fixed;
- border-top: 8px solid rgba(51,51,51,.8);
- }
- #wrapper {
- border-top: 1px solid #999;
- margin-top: 160px;
- padding: 15px;
- background: #eee;
- background: -webkit-linear-gradient(#fff,#ccc);
- background: -moz-linear-gradient(#fff,#ccc);
- background: -ms-linear-gradient(#fff,#ccc);
- background: -o-linear-gradient(#fff,#ccc);
- opacity: .9;
- box-shadow: 0px 1px 8px rgba(0,0,0,0.3);
- }
- #inner {
- width: 350px;
- margin: 0 auto;
- }
- #button {
- margin: 0 auto;
- border-radius: 3px;
- text-align: center;
- font: 36px verdana,arial,sans-serif;
- color: white;
- text-shadow: 0 -1px 0 rgba(0,0,0,.8);
- height: 70px;
- line-height: 70px;
- background: #555;
- background: -webkit-linear-gradient(#5F5F5F,#565656 50%,#4C4C4C 51%,#373737);
- background: -moz-linear-gradient(#5F5F5F,#565656 50%,#4C4C4C 51%,#373737);
- background: -ms-linear-gradient(#5F5F5F,#565656 50%,#4C4C4C 51%,#373737);
- background: -o-linear-gradient(#5F5F5F,#565656 50%,#4C4C4C 51%,#373737);
- box-shadow: inset 0 1px 3px rgba(0,0,0,0.9);
- }
- #button:hover {
- cursor: pointer;
- background: #666;
- background: -webkit-linear-gradient(#707070,#666666 50%,#5B5B5B 51%,#474747);
- background: -moz-linear-gradient(#707070,#666666 50%,#5B5B5B 51%,#474747);
- background: -ms-linear-gradient(#707070,#666666 50%,#5B5B5B 51%,#474747);
- background: -o-linear-gradient(#707070,#666666 50%,#5B5B5B 51%,#474747);
- }
- #button:active {
- box-shadow: inset 0 1px 12px rgba(0,0,0,0.9);
- background: #444;
- }
- #label {
- text-align: left;
- text-shadow: 0 1px 1px #fff;
- margin: 16px auto 0;
- }
- form {
- height: 38px;
- background: #fff;
- border: 1px solid #bbb;
- border-radius: 3px;
- position: relative;
- }
- button, input {
- font-weight: bold;
- font-size: 15px;
- }
- input[type="text"] {
- border-radius: 3px;
- box-sizing: border-box;
- -moz-box-sizing: border-box;
- padding: 0 45px 0 10px;
- *padding: 0; /* IE7 hack */
- width: 100%;
- height: 100%;
- outline: none;
- border: none;
- position: absolute;
- }
- button[type="submit"] {
- position: absolute;
- right: 0;
- width: 45px;
- height: 38px;
- }
- @media only screen and (min-device-width: 320px) and (max-device-width: 720px) {
- body {
- background: #bbb;
- background: -webkit-linear-gradient(#aaa,#eee 60%) center fixed;
- background: -moz-linear-gradient(#aaa,#eee 60%) center fixed;
- background: -ms-linear-gradient(#aaa,#eee 60%) center fixed;
- }
- #wrapper {
- margin-top: 0;
- }
- #inner {
- width: 95%;
- }
- #label {
- text-align: center;
- }
- }
- /*]]>*/
- </style>
- <link href="static/css/index.css" rel="stylesheet" th:href="@{/static/css/index.css}"/>
+ <link href="../../static/css/index.css" rel="stylesheet" th:href="@{/static/css/index.css}"/>
</head>
<body>
<div id="wrapper">
+ <h1 th:text="#{renkanIndex.renkan_spaces}">Renkan Spaces</h1>
<div id="inner">
<div id="button" onclick="go2Random()" class="translate" th:utext="#{renkanIndex.new_space}">New Space</div>
<div id="label" class="translate" th:text="#{renkanIndex.space_exp}">Create a Space with the title</div>
@@ -142,7 +32,7 @@
<tr>
<th th:text="#{renkanIndex.space_name}">Name</th>
<th th:text="#{renkanIndex.space_creation}">Creation</th>
- <th th:text="#{renkanIndex.space_proj_count}">Proj. count</th>
+ <th th:text="#{renkanIndex.space_proj_count}">Project count</th>
<th th:text="#{renkanIndex.space_open}">Edit</th>
</tr>
</thead>
--- a/server/src/main/webapp/static/css/index.css Fri Mar 15 10:38:05 2013 +0100
+++ b/server/src/main/webapp/static/css/index.css Fri Mar 15 12:54:36 2013 +0100
@@ -1,30 +1,54 @@
- body {
- margin: 0;
- height: 100%;
- color: #333;
- font: 14px helvetica, sans-serif;
- background: #ddd;
- background: -webkit-radial-gradient(circle,#aaa,#eee 60%) center fixed;
- background: -moz-radial-gradient(circle,#aaa,#eee 60%) center fixed;
- background: -ms-radial-gradient(circle,#aaa,#eee 60%) center fixed;
- background: -o-radial-gradient(circle,#aaa,#eee 60%) center fixed;
- border-top: 8px solid rgba(51,51,51,.8);
- }
- #wrapper {
- border-top: 1px solid #999;
- margin-top: 160px;
- padding: 15px;
- background: #eee;
- background: -webkit-linear-gradient(#fff,#ccc);
- background: -moz-linear-gradient(#fff,#ccc);
- background: -ms-linear-gradient(#fff,#ccc);
- background: -o-linear-gradient(#fff,#ccc);
- opacity: .9;
- box-shadow: 0px 1px 8px rgba(0,0,0,0.3);
- }
+body, h1, h2, table, tbody, thead, tr, td, th {
+ border: none; margin: 0; padding: 0; text-align: left; font-size: 100%;
+}
+body {
+ margin: 0; padding: 0; font-family: Arial, Helvetica, sans-serif; background: #F6F6F6; color: #333333;
+}
+h1 {
+ margin-bottom: 5px; padding: 15px; border-bottom: 2px solid #ffffff; background: #333333; color: #ffffff;
+ font-weight: bold; font-size: 30px;
+}
+h2 {
+ margin: 12px 15px 2px;
+}
+h3 {
+ color: #999999; font-size: 15px; font-weight: bold;
+ font-style: italic; margin: 5px 30px;
+}
+a {
+ text-decoration: none; color: #3030a0;
+}
+a:hover {
+ text-decoration: underline;
+}
+table {
+ border-collapse: collapse; margin: 5px 15px; border: 1px solid #CCCCCC;
+}
+th, td {
+ padding: 4px 16px 4px 4px; border: 1px solid #cccccc;
+}
+thead {
+ font-size: 16px;
+}
+tbody {
+ font-size: 14px;
+}
+tbody tr:nth-child(even) {
+ background: #fafafa;
+}
+tbody tr:nth-child(odd) {
+ background: #f0f0f0;
+}
+thead tr {
+ background: #666666; color: #f0e0e0;
+}
+tbody tr:hover {
+ background: #ffffff;
+}
+
#inner {
width: 300px;
- margin: 0 auto;
+ margin: 10px auto;
}
#button {
margin: 0 auto;
@@ -87,21 +111,4 @@
right: 0;
width: 45px;
height: 38px;
- }
- @media only screen and (min-device-width: 320px) and (max-device-width: 720px) {
- body {
- background: #bbb;
- background: -webkit-linear-gradient(#aaa,#eee 60%) center fixed;
- background: -moz-linear-gradient(#aaa,#eee 60%) center fixed;
- background: -ms-linear-gradient(#aaa,#eee 60%) center fixed;
- }
- #wrapper {
- margin-top: 0;
- }
- #inner {
- width: 95%;
- }
- #label {
- text-align: center;
- }
- }
+ }
\ No newline at end of file