background-color: #fdfdfd;
color: #333;
font-family: 'Oswald', sans-serif;
- font-size: 14px;
+ font-size: 15px;
margin-left: auto;
margin-right: auto;
- width:960px; /* largeur obligatoire pour être centré */
+ width: 1280px; /* largeur obligatoire pour être centré */
}
-p, ol, ul, td {
-}
pre {
background-color: #eee;
a {
color: #000;
- &:visited {
- }
&:hover {
color: green;
background-color: #fff;
.notice {
color: darkred;
font-size: 14px;
- font-weigh: bold;
+ font-weight: bold;
font-style: italic;
}
+++ /dev/null
-body {
- background-color:#F7FAFA;
- color: #333;
- font-family: 'Oswald', sans-serif;
- font-size: 14px;
- line-height: 18px;
- margin-left: auto;
- margin-right: auto;
- width:960px; /* largeur obligatoire pour être centré */
-}
-
-p, ol, ul, td {
- font-size: 13px;
- line-height: 18px;
-}
-
-pre {
- background-color: #eee;
- padding: 10px;
- font-size: 11px;
-}
-
-label {
- font-weight: bold;
- padding-left: 5px;
-}
-
-#progress {
- font-weight:bold;
- font-size:17px;
- color:darkred;
-}
-#progress_done {
- font-weight:bold;
- font-size:17px;
- color:darkgrey;
-}
-
-a {
- color: #000;
- &:visited {
- }
- &:hover {
- color: green;
- background-color: #fff;
- }
-}
-
-div {
- &.field, &.actions {
- margin-bottom: 10px;
- }
-}
-
-#notice_box {
- height: 14px;
- display: block;
- margin-top: 2px;
- text-align: center;
- }
-
-.notice {
- color: darkred;
- font-size: 14px;
- font-weigh: bold;
- font-style: italic;
-}
-
-.field_with_errors {
- padding: 2px;
- background-color: red;
- display: table;
-}
-
-#error_explanation {
- width: 450px;
- border: 2px solid red;
- padding: 7px;
- padding-bottom: 0;
- margin-bottom: 20px;
- background-color: #f0f0f0;
- h2 {
- text-align: left;
- font-weight: bold;
- padding: 5px 5px 5px 15px;
- font-size: 12px;
- margin: -7px;
- margin-bottom: 0px;
- background-color: #c00;
- color: #fff;
- }
- ul li {
- font-size: 12px;
- list-style: square;
- }
-}
-
-h1, h2, h3, h4 {
- color: #005f5f;
-}
-
-h1, h3 {
- a {
- font-size:10px;
- padding-left:10px;
- color: lightgrey;
- }
-}
-
-.nav ul {
- list-style: none;
- background-color: #444;
- text-align: center;
- padding: 0;
- margin: 0;
-}
-.nav li {
- font-family: 'Oswald', sans-serif;
- line-height: 40px;
- height: 40px;
- border-bottom: 1px solid #888;
-}
-
-.nav a {
- text-decoration: none;
- color: #fff;
- display: block;
- transition: .3s background-color;
-}
-
-.nav a:hover {
- background-color: #005f5f;
- text-decoration: underline;
-}
-
-.nav a.active {
- background-color: #F7FAFA;
- color: #005f5f;
- text-decoration: underline;
-}
-
-@media screen and (min-width: 600px) {
- .nav li {
- width: 120px;
- border-bottom: none;
- height: 40px;
- line-height: 40px;
- font-size: 1em;
- }
-
- /* Option 1 - Display Inline */
- .nav li {
- display: inline-block;
- margin-right: -4px;
- }
-}
-
-table {
- th {
- font-size:0.8em;
- }
- td {
- padding-left: 10px;
- padding-right: 10px;
- }
-
-}
-
-#welcome {
-
- li {
- list-style-type:none;
- font-size: 14px;
- padding-top: 3px;
- padding-left: 1em;
- text-indent: -.7em;
- }
-
- li:before {
- content: "• ";
- color: darkred;
- }
-
-}
-
-#logs {
- a {
- text-decoration:none;
- color: darkred;
- }
-}
-
-.search {
- margin-top:20px;
- margin-bottom:20px;
- img.logo {
- }
-}
-
-.searchbutton {
- font-size: 20px;
-
-}
-
-input.searchfield {
- font-size: 20px;
-}
-
-.searchglass {
- margin-left: 200px;
-}
-
-hr.style-two {
- border: 0; height: 1px; background-image: -webkit-linear-gradient(left, rgba(0,0,0,0), rgba(0,0,0,0.75), rgba(0,0,0,0)); background-image: -moz-linear-gradient(left, rgba(0,0,0,0), rgba(0,0,0,0.75), rgba(0,0,0,0)); background-image: -ms-linear-gradient(left, rgba(0,0,0,0), rgba(0,0,0,0.75), rgba(0,0,0,0)); background-image: -o-linear-gradient(left, rgba(0,0,0,0), rgba(0,0,0,0.75), rgba(0,0,0,0));
-}
-
-/* #Alizarin Flat Button
-==================================================*/
-.alizarin-flat-button {
- position: relative;
- vertical-align: top;
- width: 160px;
- height: 30px;
- padding: 0;
- font-size: 17px;
- color: white;
- text-align: center;
- text-shadow: 0 1px 2px rgba(0, 0, 0, 0.25);
- background: #19AB58;
- border: 0;
- cursor: pointer;
-}
-.alizarin-flat-button:active {
- top: 1px;
- outline: none;
- -webkit-box-shadow: none;
- box-shadow: none;
-}
-.alizarin-flat-button-phone {
- position: relative;
- vertical-align: top;
- width: 70%;
- height: 150px;
- padding: 0;
- font-size: 50px;
- color: black;
- text-align: center;
- background: #19AB58;
- border: 0;
-}
-
-
-.avatar {
- border: 1px solid white;
- height: 90px;
- width: 90px;
- display: block;
- border-radius: 45px;
- box-shadow: 1px 1px 1px rgba(0,0,0, 0.7);
-}
-
-.avatar {
- background: rgba(0, 0, 0, 0.2);
-}
-
-.avatar img {
- border-radius: 40px;
- width: 80px;
- height: 80px;
- margin: 6px; /* centers the image in the parent element */
-}
-
-.mini_avatar {
- border-radius: 15px;
- width: 25px;
- height: 25px;
-}
-
-.mobile_textfield {
- font-weight:bold;
- font-size:60px
-
-}
# GET /todolists/new
def new
@todolist = Todolist.new
+ @todolist.project_id = params[:project_id]
end
# GET /todolists/1/edit
<tbody>
<% @projects.each do |project| %>
<tr>
- <td style="background-color:<%= project.color %>;padding-left:10px;"></td>
+ <td style="background-color:<%= project.color %>;padding-left: 7px;"></td>
<td>
<%= link_to project.name, project, class: 'bold-title' %>
- <br><i><%= project.description %></li></td>
+ <br>
+ <i><small><%= project.description %></small></i>
+ </td>
<td><%= l(project.duedate) if project.duedate %></td>
<td>
<% unless project.todos.count.zero? %>
<h2>
- <span style="background-color:<%= @project.color %>;padding-left:5px;margin-right:5px;"></span>
+ <span style="background-color:<%= @project.color %>;padding-left: 7px;margin-right: 7px;"></span>
<%= @project.name %>
<%= link_to image_tag("modif.png"), edit_project_path(@project), title:'Modifier' %>
</h2>
+<% unless @project.description.blank? %>
+ <i><%= @project.description %></i>
+ <br /><br />
+<% end %>
+
<% unless @project.pct_avancee.zero? %>
Avancée: <%= raw @project.bar_avancee %>
<small>(<%= @project.pct_avancee %>%)</small>
<% end %>
+
<% if @project.workflow? and @project.current_todolist %>
| Phase en cours: <%= @project.current_todolist.name %>
<% end %>
-<% if @project.duedate %>
- | Echéance: <b><%= l(@project.duedate) %></b>
-<% end %>
-<% if @project.tag_list.any? %>
- | Tags: <%= @project.tag_list_on(:tags) %><br>
-<% end %>
-<% unless @project.description.blank? %>
- <br>
- <i> <%= @project.description %></i>
- <br>
+<% if @project.duedate %>
+ | Echéance: <b><%= l(@project.duedate) %></b>
<% end %>
-<% unless @project.memo.blank? %>
- <i><%= @project.memo %></i>
-<% end %>
-<br><br>
-
-<% if @project.workflow? %>
- <h3>Phases</h3>
-<% else %>
- <h3>To-do</h3>
+<% if @project.tag_list.any? %>
+ | Tags: <%= @project.tag_list_on(:tags) %>
<% end %>
-
<% if @project.todolists.any? %>
<% if @project.todos.any? %>
- <div style=";font-size:9px;">
- Afficher:
- <%= link_to_if params[:done], "Tout", project_path(@project) %> |
- <%= link_to_unless params[:done], "Reste à faire", project_path(@project, done:false) %>
- </div>
+ | Afficher tâches :
+ <%= link_to_if params[:done], "Toutes", project_path(@project) %> /
+ <%= link_to_unless params[:done], "Reste à faire", project_path(@project, done:false) %>
<br>
<% end %>
<% else %>
Ces listes (ou phases) servent à découper un projet en tranches. (ex: Début/Milieu/Fin ou Prospection/Evaluation/Devis/Commande/Livraison/Facture).</i></small>
<% end %>
+
+<% unless @project.memo.blank? %>
+ <i><%= @project.memo %></i>
+<% end %>
+<br><br>
+
<table class="table">
<thead>
- <th />
+ <th><%= @project.workflow? ? 'Phases' : 'To-do' %></th>
<th>Tâches</th>
<th>Réalisation</th>
<th>Réalisées/Total</th>
<th>Dernière réalisation le</th>
<th>Ecart</th>
</thead>
- <%= render partial:'todolists/todolist', collection:@todolists %>
+ <tbody>
+ <%= render partial: 'todolists/todolist', collection: @todolists %>
+ </tbody>
+ <tfoot>
+ <tr>
+ <td colspan=7>
+ <%= link_to image_tag("new.png"), new_todolist_path(project_id: @project.id), title: 'Ajouter une liste/phase' %>
+ </td>
+ </tr>
+ </tfoot>
</table>
-<%= render partial:'todolists/form' %>
-
<% if @logs.any? %>
<br>
<h3>Activité</h3>
<% if @logs.any? %>
<table id="logs">
- <%= render partial:'logs/log', collection:@logs, :day => 0 %>
+ <%= render partial:'logs/log', collection: @logs, :day => 0 %>
</table>
<br>
<% if @logs.count > 5 %>
</div>
<% end %>
- <div class="field">
- <%= f.hidden_field :project_id %>
- </div>
-
- <% if @todolist.project.workflow? %>
- Nouvelle phase
- <% else %>
- Nouvelle To-do liste
- <% end %>
+ <% if @todolist.project.workflow? %>
+ Nouvelle phase
+ <% else %>
+ Nom de la nouvelle To-do liste
+ <% end %>
<div class="field">
<% if @todolist.project.workflow? and defined?(@rows) %>
</div>
<div class="field">
- <%= f.text_field :name, size:'40' %>
-
+ <%= f.hidden_field :project_id %>
+ <%= f.text_field :name, size: '25' %>
<%= f.label 'Echéance:' %>
<%= f.text_field :duedate, size:5, class: "datepicker", value:(@todolist.duedate ? l(@todolist.duedate) : nil) %>
</div>
-
<div class="actions">
<%= f.submit @todolist.new_record? ? "Ajouter" : "Valider", class: 'alizarin-flat-button' %>
</div>
<i><%= todolist.row %>.</i>
<% end %>
<% if todolist.done? %>
- <strike><%= link_to todolist.name, todolist, class:'bold-title' %></strike>
+ <strike><%= link_to todolist.name, todolist, class: 'bold-title' %></strike>
<% else %>
- <%= link_to todolist.name, todolist, class:'bold-title', title:"Cliquez pour ouvrir cette liste et voir les choses à faire", data: { no_turbolink: true } %>
+ <%= link_to todolist.name, todolist, class: 'bold-title', title:"Cliquez pour ouvrir cette liste et voir les choses à faire", data: { no_turbolink: true } %>
<% end %>
</td>
<td>
-<h1>New todolist</h1>
+<h2>
+ <%= link_to @todolist.project.name, @todolist.project %>
+</h2>
<%= render 'form' %>
-<%= link_to 'Back', todolists_path %>
+<%= link_to 'Retour', @todolist.project %>
<h2>
- <span style="background-color:<%= @todolist.project.color %>;padding-left:5px;margin-right:5px;"></span>
+ <span style="background-color:<%= @todolist.project.color %>;padding-left: 7px;margin-right: 7px;"></span>
<%= link_to @todolist.project.name, @todolist.project %> : <%= @todolist.name %>
<%= link_to image_tag("modif.png"), edit_todolist_path(@todolist), title:'Modifier' %>
</h2>