Skip to content

Commit

Permalink
re #76 all the templates are now factorized, we're only missing code …
Browse files Browse the repository at this point in the history 
…modification to share css/img/js between skins
  • Loading branch information
@allan-simon
allan-simon committed Jul 5, 2013
1 parent 24e7b72 commit 8270529
Show file tree
Hide file tree
Showing 10 changed files with 139 additions and 307 deletions.
2 changes: 1 addition & 1 deletion app/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.6)
project(tatowiki)

# set the version
set(PROJECT_VERSION "0.20.4")
set(PROJECT_VERSION "0.20.5")
set(ARCHIVE_NAME ${CMAKE_PROJECT_NAME}-${PROJECT_VERSION})
add_custom_target(
dist
Expand Down
21 changes: 21 additions & 0 deletions app/src/views/webs/commons/users/change_password.tmpl
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<% c++ #include "contents/Users.h" %>
<% skin %>
<% view common_users_change_password uses contents::users::ChangePassword extends master %>
<% template title() %><% gt "Change password" %><% end template %>


<% template main_content() %>
<form method="POST" action="/users/change-password_treat" >
<% form as_p changePasswordForm %>
</form>
<% end template %>

<% template annexe_content() %>

<% end template %>



<% end view %>
<% end skin %>

57 changes: 57 additions & 0 deletions app/src/views/webs/commons/users/login.tmpl
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
<% c++ #include "contents/Users.h" %>
<% skin %>
<% view common_users_login uses contents::users::Login extends master %>
<% template title() %><% gt "Login" %><% end template %>

<% template local_css() %>
<% include css_link("users/login.css") %>
<% end template %>


<% template main_content() %>
<% include begin_module() %>
<h2><% gt "Login" %></h2>
<form
method="POST"
action="/users/login_treat"
id="UserLoginForm"
>
<% form input loginForm.previousUrl %>
<table class='input'>
<% include widget_row(loginForm.username) %>
<% include widget_row(loginForm.password) %>
<% include widget_row(loginForm.rememberMe) %>
</table>

<div class="submit">
<% form input loginForm.submit %>
</div>

</form>

<h2><% gt "No account yet?" %></h2>
<div id="ClickHereToRegister">
<a href="/users/register-new" class="registerButton"><% gt "Register" %></a>
</div>
<% include end_module() %>
<% end template %>

/**
*
*/
<% template annexe_content() %>
<% include begin_module() %>
<h2><% gt "Note:" %></h2>
<p>
<% gt "For the moment there's no automatic 'password forgotten' mechanism, instead send an email to the administrators" %>
</p>
<% include end_module() %>
<% end template %>





<% end view %>
<% end skin %>

52 changes: 52 additions & 0 deletions app/src/views/webs/commons/users/register_new.tmpl
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
<% c++ #include "contents/Users.h" %>
<% skin %>
<% view common_users_register_new uses contents::users::RegisterNew extends master %>
<% template title() %><% gt "Register a new user" %><% end template %>

<% template css() %><% include css_link("users/register-new.css") %><% end template%>


<% template main_content() %>
<% include begin_module() %>
<h2><% gt "Register a new user" %></h2>
<form id="UsersRegisterForm" method="POST" action="/users/register-new_treat" >
<table>
<% include widget_row(registerNewForm.username) %>
<% include widget_row(registerNewForm.password) %>
<% include widget_row(registerNewForm.email) %>
</table>
<div id="quiz">
<% gt "We need to make sure you are human." %>
<label for="<%= registerNewForm.quiz.name()">
<%= registerNewForm.quiz.message() %>
</label>
<p>
<% form input registerNewForm.quiz %>
</p>
<% gt "For instance, if your email is [email protected], the answer is \"me123\"." %>
</div>
<div id="termsOfUse">
<% form input registerNewForm.termsOfUse %>
<label for="<%= registerNewForm.termsOfUse.name()">
<%= registerNewForm.termsOfUse.message() %>
<label>
</div>
<div class="submit">
<% form input registerNewForm.submit %>
</div>
</form>
<% include end_module() %>
<% end template %>

<% template annexe_content() %>
<% include begin_module() %>
<h2><% gt "Note:" %></h2>
<p>
<% gt "Your email address will never be given or sold to third services. It will only be used internally to send you automatic notification or in case you lose your password." %>
</p>
<% include end_module() %>
<% end template %>

<% end view %>
<% end skin %>

16 changes: 1 addition & 15 deletions app/src/views/webs/responsive/users/change_password.tmpl
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,6 @@
<% c++ #include "contents/Users.h" %>
<% skin %>
<% view users_change_password uses contents::users::ChangePassword extends master %>
<% template title() %><% gt "Change password" %><% end template %>


<% template main_content() %>
<form method="POST" action="/users/change-password_treat" >
<% form as_p changePasswordForm %>
</form>
<% end template %>

<% template annexe_content() %>

<% end template %>


<% view users_change_password uses contents::users::ChangePassword extends common_users_change_password %>

<% end view %>
<% end skin %>
Expand Down
81 changes: 2 additions & 79 deletions app/src/views/webs/responsive/users/login.tmpl
View file
Original file line number Diff line number Diff line change
@@ -1,83 +1,6 @@
<% c++ #include "contents/Users.h" %>
<% skin responsive%>
<% view users_login uses contents::users::Login extends master %>
<% template title() %><% gt "Login" %><% end template %>

<% template local_css() %>
<% include css_link("users/login.css") %>
<% end template %>


<% template main_content() %>
<% include begin_module() %>
<h2><% gt "Login" %></h2>
<form
method="POST"
action="/users/login_treat"
id="UserLoginForm"
>
<% form input loginForm.previousUrl %>
<table class='input'>
<tr>
<td>
<label for="<%= loginForm.username.name() %>">
<%= loginForm.username.message() %>
</label>
</td>
<td>
<% form input loginForm.username %>
</td>
</tr>
<tr>
<td>
<label for="<%= loginForm.password.name() %>">
<%= loginForm.password.message() %>
</label>
</td>
<td>
<% form input loginForm.password %>
</td>
</tr>
<tr>
<td>
<label for="<%= loginForm.rememberMe.name() %>">
<%= loginForm.rememberMe.message() %>
</label>
</td>
<td>
<% form input loginForm.rememberMe %>
</td>
</tr>
</table>

<div class="submit">
<% form input loginForm.submit %>
</div>

</form>

<h2><% gt "No account yet?" %></h2>
<div id="ClickHereToRegister">
<a href="/users/register-new" class="registerButton"><% gt "Register" %></a>
</div>
<% include end_module() %>
<% end template %>

/**
*
*/
<% template annexe_content() %>
<% include begin_module() %>
<h2><% gt "Note:" %></h2>
<p>
<% gt "For the moment there's no automatic 'password forgotten' mechanism, instead send an email to the administrators" %>
</p>
<% include end_module() %>
<% end template %>




<% skin %>
<% view users_login uses contents::users::Login extends common_users_login %>

<% end view %>
<% end skin %>
Expand Down
62 changes: 2 additions & 60 deletions app/src/views/webs/responsive/users/register_new.tmpl
View file
Original file line number Diff line number Diff line change
@@ -1,64 +1,6 @@
<% c++ #include "contents/Users.h" %>
<% skin responsive %>
<% view users_register_new uses contents::users::RegisterNew extends master %>
<% template title() %><% gt "Register a new user" %><% end template %>

<% template css() %><% include css_link("users/register-new.css") %><% end template%>


<% template main_content() %>
<% include begin_module() %>
<h2><% gt "Register a new user" %></h2>
<form id="UsersRegisterForm" method="POST" action="/users/register-new_treat" >
<table>
<tr>
<td><%= registerNewForm.username.message() %></td>
<td><% form input registerNewForm.username %></td>
</tr>
<tr>
<td><%= registerNewForm.password.message() %></td>
<td><% form input registerNewForm.password %></td>
</tr>
<tr>
<td><%= registerNewForm.email.message() %></td>
<td><% form input registerNewForm.email%></td>
</tr>
</table>
<div id="quiz">
<% gt "We need to make sure you are human." %>
<label for="<%= registerNewForm.quiz.name()">
<%= registerNewForm.quiz.message() %>
</label>
<p>
<% form input registerNewForm.quiz %>
</p>
<% gt "For instance, if your email is [email protected], the answer is \"me123\"." %>
</div>
<div id="termsOfUse">
<% form input registerNewForm.termsOfUse %>
<label for="<%= registerNewForm.termsOfUse.name()">
<%= registerNewForm.termsOfUse.message() %>
<label>
</div>
<div class="submit">
<% form input registerNewForm.submit %>
</div>
</form>
<% include end_module() %>
<% end template %>

<% template annexe_content() %>
<% include begin_module() %>
<h2><% gt "Note:" %></h2>
<p>
<% gt "Your email address will never be given or sold to third services. It will only be used internally to send you automatic notification or in case you lose your password." %>
</p>

</div>
<% include end_module() %>
<% end template %>


<% skin %>
<% view users_register_new uses contents::users::RegisterNew extends common_users_register_new %>

<% end view %>
<% end skin %>
Expand Down
16 changes: 1 addition & 15 deletions app/src/views/webs/tatoeba/users/change_password.tmpl
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,6 @@
<% c++ #include "contents/Users.h" %>
<% skin %>
<% view users_change_password uses contents::users::ChangePassword extends master %>
<% template title() %><% gt "Change password" %><% end template %>


<% template main_content() %>
<form method="POST" action="/users/change-password_treat" >
<% form as_p changePasswordForm %>
</form>
<% end template %>

<% template annexe_content() %>

<% end template %>


<% view users_change_password uses contents::users::ChangePassword extends common_users_change_password %>

<% end view %>
<% end skin %>
Expand Down
Loading

0 comments on commit 8270529

Please sign in to comment.