Id's tocados. Placeholders en register y links a index en template

Metronus · Apr 24, 2017 · 2beb2d7 · 2beb2d7
1 parent 98d80f3
commit 2beb2d7
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 15 deletions.
diff --git a/Metronus-Project/locale/en/LC_MESSAGES/django.po b/Metronus-Project/locale/en/LC_MESSAGES/django.po
@@ -566,6 +566,8 @@ msgid "roleCreation_editingHigherRole"
 msgstr "The role that you are trying to edit is higher than yours"
 msgid "roleCreation_formNotValid"
 msgstr "This information is not correct"
+msgid "photo"
+msgstr "Picture"
 
 #: Company
 msgid "registerCompany"

diff --git a/Metronus-Project/locale/es/LC_MESSAGES/django.po b/Metronus-Project/locale/es/LC_MESSAGES/django.po
@@ -564,6 +564,8 @@ msgid "roleCreation_editingHigherRole"
 msgstr "El rol que se intenta editar es superior al suyo y no se puede editar"
 msgid "roleCreation_formNotValid"
 msgstr "La información enviada no es correcta"
+msgid "photo"
+msgstr "Foto"
 
 #: Company
 msgid "registerCompany"

diff --git a/Metronus-Project/metronus/templates/company/company_register.html b/Metronus-Project/metronus/templates/company/company_register.html
@@ -54,7 +54,7 @@
             <div class="form-group required company_class form-class" id="div_cif">
               <label class="control-label col-sm-3" for="id_{{ form.cif.name }}">{% trans 'cif' %}</label>
               <div class="col-sm-6">
-                <input type="text" class="form-control col-md-6" name="{{ form.cif.name }}"  id="id_{{ form.cif.name }}" value="{{form.cif.value|default_if_none:""}}">
+                <input type="text" class="form-control col-md-6" name="{{ form.cif.name }}"  id="id_{{ form.cif.name }}" value="{{form.cif.value|default_if_none:""}}" placeholder="A12345678">
                 <div class="help-block with-errors" id="id_unique_message" style="color:#a94442;">{{ form.cif.errors }}</div>
                 <div class="help-block with-errors" id="id_unique_message_cif" style="display: none;">{% trans 'company_duplicate' %}</div>
               </div>
@@ -63,15 +63,15 @@
         <div class="form-group required company_class form-class">
           <label class="control-label col-sm-3" for="id_{{ form.company_name.name }}">{% trans 'company_name' %}</label>
             <div class="col-sm-6">
-              <input type="text" class="form-control col-md-6" name="{{ form.company_name.name }}" id="id_{{ form.company_name.label }}" value="{{form.company_name.value|default_if_none:""}}">
+              <input type="text" class="form-control col-md-6" name="{{ form.company_name.name }}" id="id_{{ form.company_name.label }}" value="{{form.company_name.value|default_if_none:""}}" placeholder="Metronus">
                 <div class="help-block with-errors" id="id_unique_message" style="color:#a94442;" >{{ form.company_name.errors }}</div>
 
             </div>
         </div>
                    <div class="form-group required company_class form-class" id="div_short_name">
           <label class="control-label col-sm-3" for="id_{{ form.short_name.name }}">{% trans 'short_name'%}</label>
             <div class="col-sm-6">
-              <input type="text" class="form-control col-md-6" name="{{ form.short_name.name }}" id="id_{{ form.short_name.name }}" value="{{form.short_name.value|default_if_none:""}}">
+              <input type="text" class="form-control col-md-6" name="{{ form.short_name.name }}" id="id_{{ form.short_name.name }}" value="{{form.short_name.value|default_if_none:""}}" placeholder="mtrns">
                 <div class="help-block with-errors" id="id_unique_message" style="color:#a94442;">{{ form.short_name.errors }}</div>
                 <div class="help-block with-errors" id="id_unique_message_short_name" style="display: none;">{% trans 'company_duplicate' %}</div>
 
@@ -81,7 +81,7 @@
         <div class="form-group required company_class form-class">
           <label class="control-label col-sm-3" for="id_{{ form.company_email.name }}">{% trans 'company_email' %}</label>
             <div class="col-sm-6">
-              <input type="email" class="form-control col-md-6" name="{{ form.company_email.name }}" id="id_{{ form.company_email.label }}" value="{{form.company_email.value|default_if_none:""}}">
+              <input type="email" class="form-control col-md-6" name="{{ form.company_email.name }}" id="id_{{ form.company_email.label }}" value="{{form.company_email.value|default_if_none:""}}" placeholder="info@metronus.com">
               <div class="help-block with-errors" id="id_unique_message" style="color:#a94442;">{{ form.company_email.errors }}</div>
 
             </div>
@@ -90,7 +90,7 @@
         <div class="form-group required company_class form-class">
           <label class="control-label col-sm-3" for="id_{{ form.company_phone.name }}">{% trans 'company_phone' %}</label>
             <div class="col-sm-6">
-            <input type="text" class="form-control col-md-6" name="{{ form.company_phone.name }}" id="id_{{ form.company_phone.label }}" value="{{form.company_phone.value|default_if_none:""}}">
+            <input type="text" class="form-control col-md-6" name="{{ form.company_phone.name }}" id="id_{{ form.company_phone.label }}" value="{{form.company_phone.value|default_if_none:""}}" placeholder="954547639">
             <div class="help-block with-errors" id="id_unique_message" style="color:#a94442;">{{ form.company_phone.errors }}</div>
 
             </div>
@@ -114,7 +114,7 @@
                     <div class="form-group required form-class" id="div_admin">
                       <label class="control-label col-sm-3" for="id_{{ form.username.label }}">{% trans 'username' %}</label>
                       <div class="col-sm-6">
-                        <input type="text" class="form-control col-md-6" name="{{ form.username.name }}" id="id_{{ form.username.name }}" value="{{form.username.value|default_if_none:""}}" >
+                        <input type="text" class="form-control col-md-6" name="{{ form.username.name }}" id="id_{{ form.username.name }}" value="{{form.username.value|default_if_none:""}}" placeholder="admin_metronus">
                         <div class="help-block with-errors" id="id_unique_message" style="color:#a94442;">{{ form.username.errors }}</div>
 
                         <div class="help-block with-errors" id="id_admin_unique_message" style="display: none;">{% trans 'admin_duplicate' %}
@@ -126,7 +126,7 @@
                     <div class="form-group required form-class">
                       <label class="control-label col-sm-3" for="id_{{ form.admin_email.label }}">{% trans 'admin_email' %}</label>
                         <div class="col-sm-6">
-                        <input type="email" class="form-control col-md-6" name="{{ form.admin_email.name }}" id="id_{{ form.admin_email.label }}" value="{{form.admin_email.value|default_if_none:""}}">
+                        <input type="email" class="form-control col-md-6" name="{{ form.admin_email.name }}" id="id_{{ form.admin_email.label }}" value="{{form.admin_email.value|default_if_none:""}}" placeholder="admin@metronus.com">
                         <div class="help-block with-errors" id="id_unique_message" style="color:#a94442;">{{ form.admin_email.errors }}</div>
 
                         </div>
@@ -136,7 +136,7 @@
                     <div class="form-group required form-class" id="div_pass_1">
                       <label class="control-label col-sm-3" for="id_{{ form.password.name }}">{% trans 'password' %}</label>
                         <div class="col-sm-6">
-                        <input type="password" class="form-control col-md-6" name="{{ form.password.name }}" id="id_{{ form.password.label }}">
+                        <input type="password" class="form-control col-md-6" name="{{ form.password.name }}" id="id_{{ form.password.label }}" placeholder="********">
                         <div class="help-block with-errors" id="id_unique_message" style="color:#a94442;">{{ form.password.errors }}</div>
 
                         </div>
@@ -145,7 +145,7 @@
                     <div class="form-group required form-class" id="div_pass_2">
                       <label class="control-label col-sm-3" for="id_{{ form.repeatPassword.name }}">{% trans 'repeatPassword' %}</label>
                         <div class="col-sm-6">
-                          <input type="password" class="form-control col-md-6" name="{{ form.repeatPassword.name }}" id="id_{{ form.repeatPassword.label }}">
+                          <input type="password" class="form-control col-md-6" name="{{ form.repeatPassword.name }}" id="id_{{ form.repeatPassword.label }}" placeholder="********">
                           <div class="help-block with-errors" id="id_unique_message" style="color:#a94442;">{{ form.repeatPassword.errors }}</div>
 
                         </div>
@@ -155,7 +155,7 @@
                     <div class="form-group required form-class">
                       <label class="control-label col-sm-3" for="id_{{ form.first_name.label }}">{% trans 'first_name' %}</label>
                         <div class="col-sm-6">
-                          <input type="text" class="form-control col-md-6" name="{{ form.first_name.name }}" id="id_{{ form.first_name.name }}" value="{{form.first_name.value|default_if_none:""}}" >
+                          <input type="text" class="form-control col-md-6" name="{{ form.first_name.name }}" id="id_{{ form.first_name.name }}" value="{{form.first_name.value|default_if_none:""}}" placeholder="Jhon">
                           <div class="help-block with-errors" id="id_unique_message" style="color:#a94442;">{{ form.first_name.errors }}</div>
 
                         </div>
@@ -165,7 +165,7 @@
                     <div class="form-group required form-class">
                       <label class="control-label col-sm-3" for="id_{{ form.last_name.label }}">{% trans 'last_name'%}</label>
                         <div class="col-sm-6">
-                          <input type="text" class="form-control col-md-6" name="{{ form.last_name.name }}" id="id_{{ form.last_name.label }}" value="{{form.last_name.value|default_if_none:""}}">
+                          <input type="text" class="form-control col-md-6" name="{{ form.last_name.name }}" id="id_{{ form.last_name.label }}" value="{{form.last_name.value|default_if_none:""}}" placeholder="Doe">
                           <div class="help-block with-errors" id="id_unique_message" style="color:#a94442;">{{ form.last_name.errors }}</div>
 
                         </div>
@@ -175,7 +175,7 @@
                     <div class="form-group required form-class">
                       <label class="control-label col-sm-3" for="id_{{ form.admin_identifier.label }}">{% trans 'admin_identifier' %}</label>
                         <div class="col-sm-6">
-                          <input type="text" class="form-control col-md-6" name="{{ form.admin_identifier.name }}" id="id_{{ form.admin_identifier.label }}" value="{{form.admin_identifier.value|default_if_none:""}}">
+                          <input type="text" class="form-control col-md-6" name="{{ form.admin_identifier.name }}" id="id_{{ form.admin_identifier.label }}" value="{{form.admin_identifier.value|default_if_none:""}}" placeholder="admn_mtn">
                           <div class="help-block with-errors" id="id_unique_message" style="color:#a94442;">{{ form.admin_identifier.errors }}</div>
                         </div>
 
@@ -184,7 +184,7 @@
                     <div class="form-group required form-class">
                       <label class="control-label col-sm-3" for="id_{{ form.admin_phone.label }}">{% trans 'admin_phone'%}</label>
                         <div class="col-sm-6">
-                          <input type="text" class="form-control col-md-6" name="{{ form.admin_phone.name }}" id="id_{{ form.admin_phone.label }}" value="{{form.admin_phone.value|default_if_none:""}}">
+                          <input type="text" class="form-control col-md-6" name="{{ form.admin_phone.name }}" id="id_{{ form.admin_phone.label }}" value="{{form.admin_phone.value|default_if_none:""}}" placeholder="666775899">
                           <div class="help-block with-errors" id="id_unique_message" style="color:#a94442;">{{ form.admin_phone.errors }}</div>
 
                         </div>

diff --git a/Metronus-Project/metronus/templates/layout_base.html b/Metronus-Project/metronus/templates/layout_base.html
@@ -44,7 +44,7 @@
         <div class="col-md-3 left_col">
           <div class="left_col scroll-view">
             <div class="navbar nav_title" style="border: 0;">
-              <a href="/app" class="site_title">
+              <a href="/dashboard/view" class="site_title">
                 {% if user.actor.company_id.logo == "" %}
                   <img src="/static/landing/img/favicon/android-icon-192x192.png" class="img-circle" width="40" height="40">
                 {% else %}
@@ -80,7 +80,7 @@ <h2>{{user.first_name}} {{user.last_name}}</h2>
               <div class="menu_section">
                 <h3>{% trans 'dashControlPanel' %}</h3>
                 <ul class="nav side-menu">
-                  <li><a href="/app"><i class="fa fa-home"></i>{% trans 'dashIndex' %}</span></a>
+                  <li><a href="/dashboard/view"><i class="fa fa-home"></i>{% trans 'dashIndex' %}</span></a>
                   </li>
                   {% if actor_is_admin or actor_is_executive or actor_is_projectManager %}
                   <li>