Download as
Browse Code »

Commit 78a15e90f6193caa2e0c71228a6d3f1e5d5e1f8b

Authored by Jailson Dias
1 parent b229219f
Exists in master and in 5 other branches amadeus_univasf, dev, image-crop, pdf_file_html, refactoring

concertando alguns erros de design #205

Showing 8 changed files with 136 additions and 136 deletions   Show diff stats
courses/templates/course/course_card.html
  Diff comments   View file @78a15e9
@@ -7,13 +7,13 @@ @@ -7,13 +7,13 @@
7 <div class="col-md-1 moreAccordion" data-toggle="collapse" data-parent="#accordion-{{course.slug}}" href=".collapseOne-{{course.slug}}" aria-expanded="false" aria-controls="collapseOne-{{course.slug}}"> 7 <div class="col-md-1 moreAccordion" data-toggle="collapse" data-parent="#accordion-{{course.slug}}" href=".collapseOne-{{course.slug}}" aria-expanded="false" aria-controls="collapseOne-{{course.slug}}">
8 <button class="btn btn-default btn-sm caret-square"><i class="fa fa-caret-square-o-down fa-2x" aria-hidden="true"></i></button> 8 <button class="btn btn-default btn-sm caret-square"><i class="fa fa-caret-square-o-down fa-2x" aria-hidden="true"></i></button>
9 </div> 9 </div>
10 - <div class="col-xs-9 col-md-4 titleTopic"> 10 + <div class="col-xs-5 col-md-5 titleTopic">
11 <a role="button" href="{% url 'course:view' course.slug %}"> 11 <a role="button" href="{% url 'course:view' course.slug %}">
12 <h4>{{course.name}}</h4> 12 <h4>{{course.name}}</h4>
13 </a> 13 </a>
14 </div> 14 </div>
15 {% if user|has_role:'professor' or user|has_role:'system_admin' %} 15 {% if user|has_role:'professor' or user|has_role:'system_admin' %}
16 - <div class="col-xs-4 col-md-6 divMoreActions" > 16 + <div class="col-xs-6 col-md-6 divMoreActions" >
17 <div class="btn-group"> 17 <div class="btn-group">
18 <button class="btn btn-default btn-sm dropdown-toggle" type="button" id="moreActions" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> 18 <button class="btn btn-default btn-sm dropdown-toggle" type="button" id="moreActions" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
19 <i class="fa fa-ellipsis-v fa-2x" aria-hidden="true"></i> 19 <i class="fa fa-ellipsis-v fa-2x" aria-hidden="true"></i>
@@ -55,11 +55,11 @@ @@ -55,11 +55,11 @@
55 </div> 55 </div>
56 </div> 56 </div>
57 57
58 -<div class="modal fade" id="replicateCourse" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"> 58 +<div class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
59 <div class="modal-dialog" role="document"> 59 <div class="modal-dialog" role="document">
60 <div class="modal-content"> 60 <div class="modal-content">
61 <div class="modal-header"> 61 <div class="modal-header">
62 - <h4 class="modal-title" id="myModalLabel">{% trans 'Repicate Course' %}</h4> 62 + <h4 class="modal-title">{% trans 'Repicate Course' %}</h4>
63 </div> 63 </div>
64 <div class="modal-body"> 64 <div class="modal-body">
65 <section> 65 <section>
courses/templates/course/create.html
  Diff comments   View file @78a15e9
@@ -43,7 +43,7 @@ @@ -43,7 +43,7 @@
43 </div> 43 </div>
44 {% endfor %} 44 {% endfor %}
45 <div class="row text-center"> 45 <div class="row text-center">
46 - <input type="submit" value="{% trans 'Create' %}" class="btn btn-primary" /> 46 + <input type="submit" value="{% trans 'Create' %}" class="btn btn-primary btn-raised" />
47 </div> 47 </div>
48 </form> 48 </form>
49 </div> 49 </div>
courses/templates/course/delete.html
  Diff comments   View file @78a15e9
@@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@
20 <!-- Modal Footer --> 20 <!-- Modal Footer -->
21 <div class="modal-footer"> 21 <div class="modal-footer">
22 <!-- Don't remove that!!! --> 22 <!-- Don't remove that!!! -->
23 - <button type="button" class="btn btn-danger btn-raised" data-dismiss="modal">{% trans "Close" %}</button> 23 + <button type="button" class="btn btn-default btn-raised" data-dismiss="modal">{% trans "Close" %}</button>
24 <button type="submit" id="button" form="delete_form" class="btn btn-primary btn-raised">{% trans "Delete" %}</button> 24 <button type="submit" id="button" form="delete_form" class="btn btn-primary btn-raised">{% trans "Delete" %}</button>
25 <script> 25 <script>
26 $("#delete_form").submit(function(event) { 26 $("#delete_form").submit(function(event) {
courses/templates/course/replicate.html
  Diff comments   View file @78a15e9
@@ -4,132 +4,132 @@ @@ -4,132 +4,132 @@
4 {% load widget_tweaks %} 4 {% load widget_tweaks %}
5 5
6 {% block breadcrumbs %} 6 {% block breadcrumbs %}
7 - <ol class="breadcrumb">  
8 - <li><a href="{% url 'app:index' %}">{% trans 'Home' %}</a></li>  
9 - <li class="active">{% trans 'Replicate Course' %}</li>  
10 - </ol> 7 +<ol class="breadcrumb">
  8 + <li><a href="{% url 'app:index' %}">{% trans 'Home' %}</a></li>
  9 + <li class="active">{% trans 'Replicate Course' %}</li>
  10 +</ol>
11 {% endblock %} 11 {% endblock %}
12 12
13 {% block content %} 13 {% block content %}
14 <div class="card card-content"> 14 <div class="card card-content">
15 - <div class="card-body">  
16 - <form method="post" action="" enctype="multipart/form-data">{% csrf_token %}  
17 - <div class="form-group is-fileinput">  
18 - <label for="id_name">{% trans 'Name' %}</label>  
19 -  
20 -  
21 - <input class="form-control" id="id_name" maxlength="100" name="name" type="text" required="" value="{{course.name}}">  
22 -  
23 - <span class="help-block">{% trans 'Course name' %}</span>  
24 -  
25 - </div>  
26 -  
27 - <div class="form-group is-fileinput">  
28 - <label for="id_objectivies">{% trans 'Objectives' %}</label>  
29 -  
30 - <textarea class="form-control" cols="80" id="id_objectivies" name="objectivies" rows="5">{{course.objectivies}}</textarea>  
31 -  
32 - <span class="help-block">{% trans 'Course objective' %}</span>  
33 -  
34 - </div>  
35 -  
36 - <div class="form-group is-fileinput">  
37 - <label for="id_content">{% trans 'Content' %}</label>  
38 -  
39 -  
40 - <textarea class="form-control" cols="80" id="id_content" name="content" rows="5">{{course.content}}</textarea>  
41 -  
42 - <span class="help-block">{% trans 'Course modules' %}</span>  
43 -  
44 - </div>  
45 -  
46 - <div class="form-group is-fileinput">  
47 - <label for="id_max_students">{% trans 'Number of studets maximum' %}</label>  
48 -  
49 -  
50 - <input class="form-control" id="id_max_students" min="0" name="max_students" type="number" value="{{course.max_students}}">  
51 -  
52 - <span class="help-block">{% trans 'Max number of students that a class can have' %}</span>  
53 -  
54 - </div>  
55 -  
56 - <div class="form-group is-fileinput">  
57 - <label for="id_init_register_date">{% trans 'Course registration start date' %}</label>  
58 -  
59 -  
60 - <input type="text" class="form-control date-picker" name="init_register_date" value="{{field.value|date:'SHORT_DATE_FORMAT'}}" min="{{now|date:'SHORT_DATE_FORMAT'}}">  
61 -  
62 - <span class="help-block">{% trans 'Date that starts the registration period of the course (dd/mm/yyyy)' %}</span>  
63 -  
64 - </div>  
65 -  
66 - <div class="form-group is-fileinput">  
67 - <label for="id_end_register_date">{% trans 'Course registration end date' %}</label>  
68 -  
69 -  
70 - <input type="text" class="form-control date-picker" name="end_register_date" value="{{field.value|date:'SHORT_DATE_FORMAT'}}" min="{{now|date:'SHORT_DATE_FORMAT'}}">  
71 -  
72 - <span class="help-block">{% trans 'Date that ends the registration period of the course (dd/mm/yyyy)' %}</span>  
73 -  
74 - </div>  
75 -  
76 - <div class="form-group is-fileinput">  
77 - <label for="id_init_date">{% trans 'Course start date' %}</label>  
78 -  
79 -  
80 - <input type="text" class="form-control date-picker" name="init_date" value="{{field.value|date:'SHORT_DATE_FORMAT'}}" min="{{now|date:'SHORT_DATE_FORMAT'}}">  
81 -  
82 - <span class="help-block">{% trans 'Date that the course starts (dd/mm/yyyy)' %}</span>  
83 -  
84 - </div>  
85 -  
86 - <div class="form-group is-fileinput">  
87 - <label for="id_end_date">{% trans 'Course end date' %}</label>  
88 -  
89 -  
90 - <input type="text" class="form-control date-picker" name="end_date" value="{{field.value|date:'SHORT_DATE_FORMAT'}}" min="{{now|date:'SHORT_DATE_FORMAT'}}">  
91 -  
92 - <span class="help-block">{% trans 'Date that the course ends (dd/mm/yyyy)' %}</span>  
93 -  
94 - </div>  
95 -  
96 - <div class="form-group is-fileinput">  
97 - <label for="id_image">{% trans 'Imagem' %}</label>  
98 -  
99 -  
100 - <input class="form-control" id="id_image" name="image" type="file">  
101 - <div class="input-group">  
102 - <input type="text" readonly="" class="form-control" placeholder="Choose your photo...">  
103 - <span class="input-group-btn input-group-sm">  
104 - <button type="button" class="btn btn-fab btn-fab-mini">  
105 - <i class="material-icons">{% trans 'attach_file' %}</i>  
106 - </button>  
107 - </span>  
108 - </div>  
109 -  
110 - <span class="help-block">{% trans 'Representative image of the course' %}</span>  
111 -  
112 - </div>  
113 -  
114 - <div class="form-group is-fileinput">  
115 - <label for="id_category">{% trans 'CourseCategory' %}</label>  
116 -  
117 -  
118 - <select class="form-control" id="id_category" name="category" required="">  
119 - {% for category in categorys_courses %}  
120 - <option value="{{category.id}}">{{category}}</option>  
121 - {% endfor %}  
122 - </select>  
123 -  
124 - <span class="help-block">{% trans 'CourseCategory which the course belongs' %}</span>  
125 -  
126 - </div>  
127 -  
128 - <div class="row text-center">  
129 - <input type="submit" value="Create" class="btn btn-primary">  
130 - </div>  
131 - </form>  
132 - </div> 15 + <div class="card-body">
  16 + <form method="post" action="" enctype="multipart/form-data">{% csrf_token %}
  17 + <div class="form-group is-fileinput">
  18 + <label for="id_name">{% trans 'Name' %}</label>
  19 +
  20 +
  21 + <input class="form-control" id="id_name" maxlength="100" name="name" type="text" required="" value="{{course.name}}">
  22 +
  23 + <span class="help-block">{% trans 'Course name' %}</span>
  24 +
  25 + </div>
  26 +
  27 + <div class="form-group is-fileinput">
  28 + <label for="id_objectivies">{% trans 'Objectives' %}</label>
  29 +
  30 + <textarea class="form-control" cols="80" id="id_objectivies" name="objectivies" rows="5">{{course.objectivies}}</textarea>
  31 +
  32 + <span class="help-block">{% trans 'Course objective' %}</span>
  33 +
  34 + </div>
  35 +
  36 + <div class="form-group is-fileinput">
  37 + <label for="id_content">{% trans 'Content' %}</label>
  38 +
  39 +
  40 + <textarea class="form-control" cols="80" id="id_content" name="content" rows="5">{{course.content}}</textarea>
  41 +
  42 + <span class="help-block">{% trans 'Course modules' %}</span>
  43 +
  44 + </div>
  45 +
  46 + <div class="form-group is-fileinput">
  47 + <label for="id_max_students">{% trans 'Number of studets maximum' %}</label>
  48 +
  49 +
  50 + <input class="form-control" id="id_max_students" min="0" name="max_students" type="number" value="{{course.max_students}}">
  51 +
  52 + <span class="help-block">{% trans 'Max number of students that a class can have' %}</span>
  53 +
  54 + </div>
  55 +
  56 + <div class="form-group is-fileinput">
  57 + <label for="id_init_register_date">{% trans 'Course registration start date' %}</label>
  58 +
  59 +
  60 + <input type="text" class="form-control date-picker" name="init_register_date" value="{{field.value|date:'SHORT_DATE_FORMAT'}}" min="{{now|date:'SHORT_DATE_FORMAT'}}">
  61 +
  62 + <span class="help-block">{% trans 'Date that starts the registration period of the course (dd/mm/yyyy)' %}</span>
  63 +
  64 + </div>
  65 +
  66 + <div class="form-group is-fileinput">
  67 + <label for="id_end_register_date">{% trans 'Course registration end date' %}</label>
  68 +
  69 +
  70 + <input type="text" class="form-control date-picker" name="end_register_date" value="{{field.value|date:'SHORT_DATE_FORMAT'}}" min="{{now|date:'SHORT_DATE_FORMAT'}}">
  71 +
  72 + <span class="help-block">{% trans 'Date that ends the registration period of the course (dd/mm/yyyy)' %}</span>
  73 +
  74 + </div>
  75 +
  76 + <div class="form-group is-fileinput">
  77 + <label for="id_init_date">{% trans 'Course start date' %}</label>
  78 +
  79 +
  80 + <input type="text" class="form-control date-picker" name="init_date" value="{{field.value|date:'SHORT_DATE_FORMAT'}}" min="{{now|date:'SHORT_DATE_FORMAT'}}">
  81 +
  82 + <span class="help-block">{% trans 'Date that the course starts (dd/mm/yyyy)' %}</span>
  83 +
  84 + </div>
  85 +
  86 + <div class="form-group is-fileinput">
  87 + <label for="id_end_date">{% trans 'Course end date' %}</label>
  88 +
  89 +
  90 + <input type="text" class="form-control date-picker" name="end_date" value="{{field.value|date:'SHORT_DATE_FORMAT'}}" min="{{now|date:'SHORT_DATE_FORMAT'}}">
  91 +
  92 + <span class="help-block">{% trans 'Date that the course ends (dd/mm/yyyy)' %}</span>
  93 +
  94 + </div>
  95 +
  96 + <div class="form-group is-fileinput">
  97 + <label for="id_image">{% trans 'Imagem' %}</label>
  98 +
  99 +
  100 + <input class="form-control" id="id_image" name="image" type="file">
  101 + <div class="input-group">
  102 + <input type="text" readonly="" class="form-control" placeholder="Choose your photo...">
  103 + <span class="input-group-btn input-group-sm">
  104 + <button type="button" class="btn btn-fab btn-fab-mini">
  105 + <i class="material-icons">{% trans 'attach_file' %}</i>
  106 + </button>
  107 + </span>
  108 + </div>
  109 +
  110 + <span class="help-block">{% trans 'Representative image of the course' %}</span>
  111 +
  112 + </div>
  113 +
  114 + <div class="form-group is-fileinput">
  115 + <label for="id_category">{% trans 'CourseCategory' %}</label>
  116 +
  117 +
  118 + <select class="form-control" id="id_category" name="category" required="">
  119 + {% for category in categorys_courses %}
  120 + <option value="{{category.id}}">{{category}}</option>
  121 + {% endfor %}
  122 + </select>
  123 +
  124 + <span class="help-block">{% trans 'CourseCategory which the course belongs' %}</span>
  125 +
  126 + </div>
  127 +
  128 + <div class="row text-center">
  129 + <input type="submit" value="Create" class="btn btn-primary btn-raised">
  130 + </div>
  131 + </form>
  132 + </div>
133 </div> 133 </div>
134 -</br>  
135 -{% endblock %}  
136 \ No newline at end of file 134 \ No newline at end of file
  135 +</br></br></br>
  136 +{% endblock %}
courses/templates/course/update.html
  Diff comments   View file @78a15e9
@@ -41,7 +41,7 @@ @@ -41,7 +41,7 @@
41 </div> 41 </div>
42 {% endfor %} 42 {% endfor %}
43 <div class="row text-center"> 43 <div class="row text-center">
44 - <input type="submit" value="{% trans 'Update' %}" class="btn btn-primary" /> 44 + <input type="submit" value="{% trans 'Update' %}" class="btn btn-primary btn-raised" />
45 </div> 45 </div>
46 </form> 46 </form>
47 </div> 47 </div>
@@ -56,4 +56,4 @@ @@ -56,4 +56,4 @@
56 language: locale, 56 language: locale,
57 }); 57 });
58 </script> 58 </script>
59 -{% endblock %}  
60 \ No newline at end of file 59 \ No newline at end of file
  60 +{% endblock %}
courses/templates/course/view.html
  Diff comments   View file @78a15e9
@@ -77,8 +77,8 @@ @@ -77,8 +77,8 @@
77 <div> 77 <div>
78 </div> 78 </div>
79 <div class="modal-footer"> 79 <div class="modal-footer">
80 - <button type="button" data-dismiss="modal" class="btn btn-default">{% trans "Cancel" %}</button>  
81 - <a href="#" target="_self"><button type="button" class="btn btn-primary"> {% trans "Confirm" %}</button></a> 80 + <button type="button" data-dismiss="modal" class="btn btn-default btn-raised">{% trans "Cancel" %}</button>
  81 + <a href="#" target="_self"><button type="button" class="btn btn-primary btn-raised"> {% trans "Confirm" %}</button></a>
82 </div> 82 </div>
83 </div> 83 </div>
84 </div> 84 </div>
courses/templates/subject/delete.html
  Diff comments   View file @78a15e9
@@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@
20 <!-- Modal Footer --> 20 <!-- Modal Footer -->
21 <div class="modal-footer"> 21 <div class="modal-footer">
22 <!-- Don't remove that!!! --> 22 <!-- Don't remove that!!! -->
23 - <button type="button" class="btn btn-danger btn-raised" data-dismiss="modal">{% trans "Close" %}</button> 23 + <button type="button" class="btn btn-raised btn-default" data-dismiss="modal">{% trans "Close" %}</button>
24 <button type="submit" id="button" form="delete_form" class="btn btn-primary btn-raised">{% trans "Delete" %}</button> 24 <button type="submit" id="button" form="delete_form" class="btn btn-primary btn-raised">{% trans "Delete" %}</button>
25 <script> 25 <script>
26 $("#delete_form").submit(function(event) { 26 $("#delete_form").submit(function(event) {
courses/templates/topic/delete.html
  Diff comments   View file @78a15e9
@@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@
20 <!-- Modal Footer --> 20 <!-- Modal Footer -->
21 <div class="modal-footer"> 21 <div class="modal-footer">
22 <!-- Don't remove that!!! --> 22 <!-- Don't remove that!!! -->
23 - <button type="button" class="btn btn-danger btn-raised" data-dismiss="modal">{% trans "Close" %}</button> 23 + <button type="button" class="btn btn-default btn-raised" data-dismiss="modal">{% trans "Close" %}</button>
24 <button type="submit" id="button" form="delete_topic_{{topic.slug}}" class="btn btn-primary btn-raised">{% trans "Delete" %}</button> 24 <button type="submit" id="button" form="delete_topic_{{topic.slug}}" class="btn btn-primary btn-raised">{% trans "Delete" %}</button>
25 <script> 25 <script>
26 $("#delete_topic_{{topic.slug}}").submit(function(event) { 26 $("#delete_topic_{{topic.slug}}").submit(function(event) {