Download as
Browse Code »

Commit 93aa91180a3d11bdfad98d0c7fad14b3d2fe4226

Authored by Felipe Henrique de Almeida Bormann
1 parent ceb0a807
Exists in master and in 3 other branches amadeus_univasf, image-crop, refactoring

fixed missing gaps on create link form and created resource delete template

Showing 5 changed files with 42 additions and 88 deletions   Show diff stats
links/models.py
  Diff comments   View file @93aa911
... ... @@ -26,4 +26,6 @@ class Link(Resource):
26 26  
27 27 def delete_link(self):
28 28 return 'links:delete'
29   -
30 29 \ No newline at end of file
  30 +
  31 + def delete_message(self):
  32 + return _('Are you sure you want delete the Website link')
31 33 \ No newline at end of file
... ...
links/templates/links/_form.html
  Diff comments   View file @93aa911
... ... @@ -100,93 +100,6 @@
100 100 {% endif %}
101 101 </div>
102 102  
103   - <div class="form-group{% if form.has_error %} has-error {% endif %}">
104   - <label for="{{ form.initial_view_date.auto_id }}">{{ form.initial_view_date.label }}</label>
105   -
106   - {% render_field form.initial_view_date class='form-control datetime-picker' %}
107   -
108   - <span id="helpBlock" class="help-block">{{ form.initial_view.help_text }}</span>
109   -
110   - {% if form.initial_view_date.errors %}
111   - <div class="alert alert-danger alert-dismissible" role="alert">
112   - <button type="button" class="close" data-dismiss="alert" aria-label="Close">
113   - <span aria-hidden="true">&times;</span>
114   - </button>
115   - <ul>
116   - {% for error in form.initial_view_date.errors %}
117   - <li>{{ error }}</li>
118   - {% endfor %}
119   - </ul>
120   - </div>
121   - {% endif %}
122   - </div>
123   -
124   - <div class="form-group{% if form.has_error %} has-error {% endif %}">
125   - <div class=" checkbox">
126   - <label for="{{ form.initial_view.auto_id }}">
127   - {% render_field form.initial_view %} {{ form.initial_view.label }}
128   - </label>
129   - </div>
130   -
131   - <span id="helpBlock" class="help-block">{{ form.initial_view.help_text }}</span>
132   -
133   - {% if form.initial_view.errors %}
134   - <div class="alert alert-danger alert-dismissible" role="alert">
135   - <button type="button" class="close" data-dismiss="alert" aria-label="Close">
136   - <span aria-hidden="true">&times;</span>
137   - </button>
138   - <ul>
139   - {% for error in form.initial_view.errors %}
140   - <li>{{ error }}</li>
141   - {% endfor %}
142   - </ul>
143   - </div>
144   - {% endif %}
145   - </div>
146   -
147   - <div class="form-group{% if form.has_error %} has-error {% endif %}">
148   - <label for="{{ form.end_view_date.auto_id }}">{{ form.end_view_date.label }}</label>
149   -
150   - {% render_field form.end_view_date class='form-control datetime-picker' %}
151   -
152   - <span id="helpBlock" class="help-block">{{ form.end_view.help_text }}</span>
153   -
154   - {% if form.end_view_date.errors %}
155   - <div class="alert alert-danger alert-dismissible" role="alert">
156   - <button type="button" class="close" data-dismiss="alert" aria-label="Close">
157   - <span aria-hidden="true">&times;</span>
158   - </button>
159   - <ul>
160   - {% for error in form.end_view_date.errors %}
161   - <li>{{ error }}</li>
162   - {% endfor %}
163   - </ul>
164   - </div>
165   - {% endif %}
166   - </div>
167   -
168   - <div class="form-group{% if form.has_error %} has-error {% endif %}">
169   - <div class=" checkbox">
170   - <label for="{{ form.end_view.auto_id }}">
171   - {% render_field form.end_view %} {{ form.end_view.label }}
172   - </label>
173   - </div>
174   -
175   - <span id="helpBlock" class="help-block">{{ form.end_view.help_text }}</span>
176   -
177   - {% if form.end_view.errors %}
178   - <div class="alert alert-danger alert-dismissible" role="alert">
179   - <button type="button" class="close" data-dismiss="alert" aria-label="Close">
180   - <span aria-hidden="true">&times;</span>
181   - </button>
182   - <ul>
183   - {% for error in form.end_view.errors %}
184   - <li>{{ error }}</li>
185   - {% endfor %}
186   - </ul>
187   - </div>
188   - {% endif %}
189   - </div>
190 103  
191 104  
192 105 <div class=" form-group panel-group" id="professors_accordion" role="tablist" aria-multiselectable="true">
... ...
subjects/templates/subjects/resource_card.html
  Diff comments   View file @93aa911
... ... @@ -59,7 +59,20 @@
59 59 <a href="{% url resource.access_link resource.slug %}" class="btn btn-success btn-raised"> {% trans "Access Resource" %}</a>
60 60  
61 61 </div>
  62 +
62 63 </div>
63 64  
  65 + {% include "resources/delete.html" with resource=resource %}
  66 +<script type="text/javascript">
  67 + function delete_resource(url) {
  68 +
  69 +
  70 + $.get(url, function (modal) {
  71 + $("#resource_{{ topic.slug }}").parent().after(modal);
  72 +
  73 + $('.modal').modal('show');
  74 + });
  75 + }
  76 +</script>
64 77  
65 78 {% endif %}
... ...
topics/models.py
  Diff comments   View file @93aa911
... ... @@ -92,4 +92,8 @@ class Resource(KnowsChild):
92 92 """
93 93 @always_as_child
94 94 def delete_link(self):
  95 + pass
  96 +
  97 + @always_as_child
  98 + def delete_message(self):
95 99 pass
96 100 \ No newline at end of file
... ...
topics/templates/resources/delete.html 0 → 100644
  Diff comments   View file @93aa911
... ... @@ -0,0 +1,22 @@
  1 +{% load i18n %}
  2 +
  3 +<div class="modal fade" id="topic" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
  4 + <div class="modal-dialog" role="document">
  5 + <div class="modal-content">
  6 + <div class="modal-body">
  7 + <form id="delete_form" action="{% url resource.delete_link resource.slug %}" method="post">
  8 + {% csrf_token %}
  9 + <h4>{{resource.delete_message}}: {{ resource.name }}?</h4>
  10 + </form>
  11 + </div>
  12 + <div class="modal-footer">
  13 + <div class="pull-right">
  14 + <button type="button" class="btn btn-default btn-raised" data-dismiss="modal">{% trans "Close" %}</button>
  15 + </div>
  16 + <div class="pull-left">
  17 + <button type="submit" form="delete_form" class="btn btn-success btn-raised">{% trans "Delete" %}</button>
  18 + </div>
  19 + </div>
  20 + </div>
  21 + </div>
  22 +</div>
0 23 \ No newline at end of file
... ...