Download as
Browse Code »

Commit e4bff4eae9c26d0a50f7b8e904f61b0c7c62cbf2

Authored by juliotoscano
1 parent 9521bbb1
Exists in master and in 5 other branches amadeus_univasf, dev, image-crop, pdf_file_html, refactoring

modifying buttons cancel #205

Showing 7 changed files with 94 additions and 100 deletions   Show diff stats
core/templates/base.html
  Diff comments   View file @e4bff4e
@@ -8,9 +8,9 @@ @@ -8,9 +8,9 @@
8 <head> 8 <head>
9 <title>{{ title }}</title> 9 <title>{{ title }}</title>
10 10
11 - <!-- jQuery & jQuery UI -->  
12 - <script type="text/javascript" src="{% static 'js/vendor/jquery-3.1.0.min.js' %}"></script>  
13 - <script type="text/javascript" src="{% static 'js/vendor/jquery-ui.js' %}"></script> 11 + <!-- jQuery & jQuery UI -->
  12 + <script type="text/javascript" src="{% static 'js/vendor/jquery-3.1.0.min.js' %}"></script>
  13 + <script type="text/javascript" src="{% static 'js/vendor/jquery-ui.js' %}"></script>
14 14
15 <meta http-equiv="Cache-Control" content="no-cache, no-store" /> 15 <meta http-equiv="Cache-Control" content="no-cache, no-store" />
16 <link href="{% static 'img/topo-amadeus.png' %}" rel="shortcut icon" /> 16 <link href="{% static 'img/topo-amadeus.png' %}" rel="shortcut icon" />
@@ -30,9 +30,7 @@ @@ -30,9 +30,7 @@
30 <link rel="stylesheet" type="text/css" href="{% static 'css/vendor/alertifyjs/themes/bootstrap.css' %}"> 30 <link rel="stylesheet" type="text/css" href="{% static 'css/vendor/alertifyjs/themes/bootstrap.css' %}">
31 <script type="text/javascript" src="{% static 'bootstrap-3.3.7/js/bootstrap.js' %}"></script> 31 <script type="text/javascript" src="{% static 'bootstrap-3.3.7/js/bootstrap.js' %}"></script>
32 <script type="text/javascript" src="{% static 'js/vendor/bootstrap-acessibility.min.js' %}"></script> 32 <script type="text/javascript" src="{% static 'js/vendor/bootstrap-acessibility.min.js' %}"></script>
33 - <script type="text/javascript" src="{% static 'material/js/material.js' %}"></script>  
34 <script type="text/javascript" src="{% static 'material/js/material.min.js' %}"></script> 33 <script type="text/javascript" src="{% static 'material/js/material.min.js' %}"></script>
35 - <script type="text/javascript" src="{% static 'material/js/ripples.js' %}"></script>  
36 <script type="text/javascript" src="{% static 'material/js/ripples.min.js' %}"></script> 34 <script type="text/javascript" src="{% static 'material/js/ripples.min.js' %}"></script>
37 <script type="text/javascript" src="{% static 'js/vendor/bootstrap-datepicker.js' %}"></script> 35 <script type="text/javascript" src="{% static 'js/vendor/bootstrap-datepicker.js' %}"></script>
38 {% with "js/vendor/locales/bootstrap-datepicker."|add:LANGUAGE_CODE|add:".js" as locale_datepicker %} 36 {% with "js/vendor/locales/bootstrap-datepicker."|add:LANGUAGE_CODE|add:".js" as locale_datepicker %}
@@ -62,92 +60,88 @@ @@ -62,92 +60,88 @@
62 60
63 </head> 61 </head>
64 <body> 62 <body>
65 - {% block nav %}  
66 - <div class="navbar navbar-default">  
67 - <div class="navbar-header">  
68 - <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-responsive-collapse">  
69 - <span class="icon-bar"></span>  
70 - <span class="icon-bar"></span>  
71 - <span class="icon-bar"></span>  
72 - </button>  
73 - <a class="navbar-brand" href="{% url 'app:index' %}"><img class="logo" src="{% static 'img/topo-amadeus-white.png' %}" alt="Logo"/></a>  
74 - </div>  
75 - <div class="navbar-collapse collapse navbar-responsive-collapse">  
76 - <div class="col-md-5 cards-content" id= 'NavBarSearch'>  
77 - <form id="SearchForm" action="{% url 'users:search' %}" method="get" accept-charset="utf-8">  
78 - <div class="input-group">  
79 - <div class="form-group is-empty" >  
80 - <input type="text" class="form-control" placeholder="{% trans 'Search Files (.pdf, others) and/or activities' %}" name="search">  
81 - </div>  
82 - <span class="input-group-btn input-group-sm">  
83 - <button type="submit" class="btn btn-primary" id="btn-search">  
84 - <i class="fa fa-search fa-2x" aria-hidden="true" style="color:#93C741"></i>  
85 - </button>  
86 - </span>  
87 -  
88 -  
89 - </div>  
90 - </form>  
91 - </div>  
92 -  
93 - <ul class="nav navbar-nav navbar-right notifications">  
94 - <li class="" data-toggle="tooltip" data-placement="bottom" title data-original-title="notifications">  
95 - <a class="dropdown-toggle" data-toggle="dropdown"> <span id="notification-count" class="badge notification-count">{{notifications.count}}</span><i class="fa fa-bell" aria-hidden="true"></i></a>  
96 - <ul id="notification-dropdown" class="dropdown-menu">  
97 - <li class="dropdown-header"> {% trans 'Notifications' %}</li>  
98 - {% include "notifications.html" %}  
99 -  
100 - <li>  
101 - <a onclick="getNotifications(5)">  
102 - <div id="notification-see-more" class="list-group-item">  
103 - <div class="row-content">  
104 - <p class="list-group-item-text">{% trans 'See More' %}</p>  
105 - </div>  
106 - </a>  
107 - </li>  
108 - </ul>  
109 - </li>  
110 -  
111 - <li data-toggle="tooltip" data-placement="bottom" title data-original-title="{% trans 'messages' %}"> <a href="#"><i class="fa fa-comments" aria-hidden="true"></i></a> </li>  
112 - <li >  
113 - <a href="" data-toggle="dropdown">{{ user }}</a>  
114 - <ul class="dropdown-menu pull-right">  
115 - <li><a href="{% url 'users:profile' %}">{% trans 'Perfil' %}</a></li>  
116 - <li><a href="{% url 'users:update_profile' %}">{% trans 'Edit Profile' %}</a></li>  
117 - <li><a href="{% url 'users:change_password' %}">{% trans 'Change password' %}</a></li>  
118 - <li><a href="{% url 'users:remove_account' %}">{% trans 'Remove account' %}</a></li>  
119 - </ul>  
120 - </li>  
121 - <li data-toggle="tooltip" data-placement="bottom" title data-original-title="log out"> <a href="{% url 'core:logout' %}"><i class="fa fa-sign-out" aria-hidden="true"></i></a></li>  
122 - </ul>  
123 - </div>  
124 - </div>  
125 - {% endblock %}  
126 - <div class="container-fluid">  
127 - <div class="row">  
128 - <div class="col-xs-2 col-sm-2 col-md-2 col-lg-2 col-xl-2">  
129 - {% block sidebar %}  
130 - {% endblock %}  
131 - </div>  
132 - <div class="col-xs-10 col-sm-10 col-md-10 col-lg-10 col-xl-10">  
133 - {% block breadcrumbs %}{% endblock %}  
134 - {% block render_breadcrumbs %}{% endblock %}  
135 - </div>  
136 - <div class="col-xs-10 col-sm-10 col-md-10 col-lg-10 col-xl-10">  
137 - {% block content %}{% endblock %}  
138 - </div>  
139 - </div>  
140 - </div>  
141 -  
142 - {% block script_file %}  
143 -  
144 - {% endblock script_file %}  
145 -  
146 - {% block script_link %}  
147 -  
148 - {% endblock script_link %}  
149 - <!-- Init material Bootstrap -->  
150 - <script type="text/javascript">$.material.init()</script> 63 + {% block nav %}
  64 + <div class="navbar navbar-default">
  65 + <div class="navbar-header">
  66 + <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-responsive-collapse">
  67 + <span class="icon-bar"></span>
  68 + <span class="icon-bar"></span>
  69 + <span class="icon-bar"></span>
  70 + </button>
  71 + <a class="navbar-brand" href="{% url 'app:index' %}"><img class="logo" src="{% static 'img/topo-amadeus-white.png' %}" alt="Logo"/></a>
  72 + </div>
  73 + <div class="navbar-collapse collapse navbar-responsive-collapse">
  74 + <div class="col-md-5 cards-content" id= 'NavBarSearch'>
  75 + <form id="SearchForm" action="{% url 'users:search' %}" method="get" accept-charset="utf-8">
  76 + <div class="input-group">
  77 + <div class="form-group is-empty" >
  78 + <input type="text" class="form-control" placeholder="{% trans 'Search Files (.pdf, others) and/or activities' %}" name="search">
  79 + </div>
  80 + <span class="input-group-btn input-group-sm">
  81 + <button type="submit" class="btn btn-primary" id="btn-search">
  82 + <i class="fa fa-search fa-2x" aria-hidden="true" style="color:#93C741"></i>
  83 + </button>
  84 + </span>
  85 + </div>
  86 + </form>
  87 + </div>
  88 + <ul class="nav navbar-nav navbar-right notifications">
  89 + <li class="" data-toggle="tooltip" data-placement="bottom" title data-original-title="notifications">
  90 + <a class="dropdown-toggle" data-toggle="dropdown"> <span id="notification-count" class="badge notification-count">{{notifications.count}}</span><i class="fa fa-bell" aria-hidden="true"></i></a>
  91 + <ul id="notification-dropdown" class="dropdown-menu">
  92 + <li class="dropdown-header"> {% trans 'Notifications' %}</li>
  93 + {% include "notifications.html" %}
  94 + <li>
  95 + <a onclick="getNotifications(5)">
  96 + <div id="notification-see-more" class="list-group-item">
  97 + <div class="row-content">
  98 + <p class="list-group-item-text">{% trans 'See More' %}</p>
  99 + </div>
  100 + </div>
  101 + </a>
  102 + </li>
  103 + </ul>
  104 + </li>
  105 + <li data-toggle="tooltip" data-placement="bottom" title data-original-title="{% trans 'messages' %}"> <a href="#"><i class="fa fa-comments" aria-hidden="true"></i></a> </li>
  106 + <li>
  107 + <a href="" data-toggle="dropdown">{{ user }}</a>
  108 + <ul class="dropdown-menu pull-right">
  109 + <li><a href="{% url 'users:profile' %}">{% trans 'Perfil' %}</a></li>
  110 + <li><a href="{% url 'users:update_profile' %}">{% trans 'Edit Profile' %}</a></li>
  111 + <li><a href="{% url 'users:change_password' %}">{% trans 'Change password' %}</a></li>
  112 + <li><a href="{% url 'users:remove_account' %}">{% trans 'Remove account' %}</a></li>
  113 + </ul>
  114 + </li>
  115 + <li data-toggle="tooltip" data-placement="bottom" title data-original-title="log out"> <a href="{% url 'core:logout' %}"><i class="fa fa-sign-out" aria-hidden="true"></i></a></li>
  116 + </ul>
  117 + </div>
  118 + </div>
  119 + {% endblock %}
  120 + <div class="container-fluid">
  121 + <div class="row">
  122 + <div class="col-xs-2 col-sm-2 col-md-2 col-lg-2 col-xl-2">
  123 + {% block sidebar %}
  124 + {% endblock %}
  125 + </div>
  126 + <div class="col-xs-10 col-sm-10 col-md-10 col-lg-10 col-xl-10">
  127 + {% block breadcrumbs %}{% endblock %}
  128 + {% block render_breadcrumbs %}{% endblock %}
  129 + </div>
  130 + <div class="col-xs-10 col-sm-10 col-md-10 col-lg-10 col-xl-10">
  131 + {% block content %}{% endblock %}
  132 + </div>
  133 + </div>
  134 + </div>
  135 +
  136 + {% block script_file %}
  137 +
  138 + {% endblock script_file %}
  139 +
  140 + {% block script_link %}
  141 +
  142 + {% endblock script_link %}
  143 + <!-- Init material Bootstrap -->
  144 + <script type="text/javascript">$.material.init()</script>
151 </body> 145 </body>
152 146
153 </html> 147 </html>
poll/templates/poll/create.html
  Diff comments   View file @e4bff4e
@@ -144,7 +144,7 @@ @@ -144,7 +144,7 @@
144 <div class="modal-footer"> 144 <div class="modal-footer">
145 145
146 <!-- Don't remove that!!! --> 146 <!-- Don't remove that!!! -->
147 - <button type="button" class="btn btn-danger btn-raised" data-dismiss="modal">{% trans "Close" %}</button> 147 + <button type="button" class="btn btn-default btn-raised" data-dismiss="modal">{% trans "Close" %}</button>
148 {% block button_save %} 148 {% block button_save %}
149 <!-- Put curtom buttons here!!! --> 149 <!-- Put curtom buttons here!!! -->
150 <button type="submite" id="button" form="form" class="btn btn-primary btn-raised">{% trans "Create" %}</button> 150 <button type="submite" id="button" form="form" class="btn btn-primary btn-raised">{% trans "Create" %}</button>
users/templates/list_users.html
  Diff comments   View file @e4bff4e
@@ -61,7 +61,7 @@ @@ -61,7 +61,7 @@
61 <p>{% trans 'Contact' %}: {{ acc.phone }}</p> 61 <p>{% trans 'Contact' %}: {{ acc.phone }}</p>
62 <div align="right"> 62 <div align="right">
63 <a href="{% url 'users:update' acc.username %}" class="btn btn-raised btn-success">{% trans 'Edit' %}</a> 63 <a href="{% url 'users:update' acc.username %}" class="btn btn-raised btn-success">{% trans 'Edit' %}</a>
64 - <a href="javascript:void(0)" class="btn btn-danger btn-raised btn-lg" data-toggle="modal" data-target="#DeleteModal{{ forloop.counter }}">{% trans 'Delete' %}</a> 64 + <a href="javascript:void(0)" class="btn btn-default btn-raised btn-lg" data-toggle="modal" data-target="#DeleteModal{{ forloop.counter }}">{% trans 'Delete' %}</a>
65 </div> 65 </div>
66 </div> 66 </div>
67 67
@@ -78,7 +78,7 @@ @@ -78,7 +78,7 @@
78 {% trans 'Are you sure you want to delete the user' %} <b>{{acc.name}}</b>? 78 {% trans 'Are you sure you want to delete the user' %} <b>{{acc.name}}</b>?
79 </div> 79 </div>
80 <div class="modal-footer"> 80 <div class="modal-footer">
81 - <a href="#" class="btn btn-raised btn-danger" data-dismiss="modal">{% trans 'Cancel' %}</a> 81 + <a href="#" class="btn btn-raised btn-default" data-dismiss="modal">{% trans 'Cancel' %}</a>
82 <a href="{% url 'users:delete' acc.username %}" class="btn btn-raised btn-success" style="margin-top: 0">{% trans 'Delete' %}</a> 82 <a href="{% url 'users:delete' acc.username %}" class="btn btn-raised btn-success" style="margin-top: 0">{% trans 'Delete' %}</a>
83 </div> 83 </div>
84 </div> 84 </div>
users/templates/users/change_password.html
  Diff comments   View file @e4bff4e
@@ -44,7 +44,7 @@ @@ -44,7 +44,7 @@
44 <input type="submit" value="{% trans 'Save' %}" class="btn btn-raised btn-block btn-success" /> 44 <input type="submit" value="{% trans 'Save' %}" class="btn btn-raised btn-block btn-success" />
45 </div> 45 </div>
46 <div class="col-md-3 col-sm-2 col-xs-2"> 46 <div class="col-md-3 col-sm-2 col-xs-2">
47 - <a href="{% url 'users:profile' %}" class="btn btn-raised btn-block btn-danger" >{% trans 'Cancel' %}</a> 47 + <a href="{% url 'users:profile' %}" class="btn btn-raised btn-block btn-default" >{% trans 'Cancel' %}</a>
48 </div> 48 </div>
49 </div> 49 </div>
50 </form> 50 </form>
users/templates/users/edit_profile.html
  Diff comments   View file @e4bff4e
@@ -99,7 +99,7 @@ @@ -99,7 +99,7 @@
99 <input type="submit" value="{% trans 'Save' %}" class="btn btn-raised btn-success" /> 99 <input type="submit" value="{% trans 'Save' %}" class="btn btn-raised btn-success" />
100 </div> 100 </div>
101 <div class="col-md-offset-3 col-md-2 col-sm-2 col-xs-2"> 101 <div class="col-md-offset-3 col-md-2 col-sm-2 col-xs-2">
102 - <a href="{% url 'users:profile' %}" class="btn btn-raised btn-danger" >{% trans 'Cancel' %}</a> 102 + <a href="{% url 'users:profile' %}" class="btn btn-raised btn-default" >{% trans 'Cancel' %}</a>
103 </div> 103 </div>
104 </form> 104 </form>
105 </div> 105 </div>
users/templates/users/remove_account.html
  Diff comments   View file @e4bff4e
@@ -32,7 +32,7 @@ @@ -32,7 +32,7 @@
32 <a href="{% url 'users:remove' user.username %}" class="btn btn-raised btn-block btn-success" >{% trans 'Remove' %}</a> 32 <a href="{% url 'users:remove' user.username %}" class="btn btn-raised btn-block btn-success" >{% trans 'Remove' %}</a>
33 </div> 33 </div>
34 <div class="col-md-3 col-sm-2 col-xs-2"> 34 <div class="col-md-3 col-sm-2 col-xs-2">
35 - <a href="{% url 'users:profile' %}" class="btn btn-raised btn-block btn-danger" >{% trans 'Cancel' %}</a> 35 + <a href="{% url 'users:profile' %}" class="btn btn-raised btn-block btn-default" >{% trans 'Cancel' %}</a>
36 </div> 36 </div>
37 </div> 37 </div>
38 </div> 38 </div>
users/templates/users/update.html
  Diff comments   View file @e4bff4e
@@ -6,10 +6,10 @@ @@ -6,10 +6,10 @@
6 {% load django_bootstrap_breadcrumbs %} 6 {% load django_bootstrap_breadcrumbs %}
7 7
8 {% block breadcrumbs %} 8 {% block breadcrumbs %}
9 - 9 +
10 {{ block.super }} 10 {{ block.super }}
11 {% breadcrumb 'Update User' 'users:update' %} 11 {% breadcrumb 'Update User' 'users:update' %}
12 - 12 +
13 {% endblock %} 13 {% endblock %}
14 14
15 15
@@ -80,7 +80,7 @@ @@ -80,7 +80,7 @@
80 <input type="submit" value="{% trans 'Save' %}" class="btn btn-raised btn-success" /> 80 <input type="submit" value="{% trans 'Save' %}" class="btn btn-raised btn-success" />
81 </div> 81 </div>
82 <div class="col-md-offset-3 col-md-2 col-sm-2 col-xs-2"> 82 <div class="col-md-offset-3 col-md-2 col-sm-2 col-xs-2">
83 - <a href="{% url 'users:manage' %}" class="btn btn-raised btn-danger" >{% trans 'Cancel' %}</a> 83 + <a href="{% url 'users:manage' %}" class="btn btn-raised btn-default" >{% trans 'Cancel' %}</a>
84 </div> 84 </div>
85 </form> 85 </form>
86 </div> 86 </div>