Commit 16bb6b6c1dbdca04c0c65ae3e278a3e59f47bc09
1 parent
cddd2c21
Exists in
master
and in
5 other branches
Fix conflit in subject view for teacher #133
Showing
1 changed file
with
0 additions
and
58 deletions
Show diff stats
courses/templates/subject/form_view_teacher.html
| @@ -231,64 +231,6 @@ | @@ -231,64 +231,6 @@ | ||
| 231 | {% include "files/create_file.html" %} | 231 | {% include "files/create_file.html" %} |
| 232 | {% endif %} | 232 | {% endif %} |
| 233 | 233 | ||
| 234 | - <!-- EndModal --> | ||
| 235 | - | ||
| 236 | - <!-- MODAL CREATE FILE --> | ||
| 237 | - <div class="modal fade" id="createFileModal" tabindex="-1" role="dialog" aria-labelledby="createFileLabel" style="display: none;"> | ||
| 238 | - <div class="modal-dialog" role="document"> | ||
| 239 | - <div class="modal-content"> | ||
| 240 | - <div class="modal-header"> | ||
| 241 | - <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button> | ||
| 242 | - <h4 class="modal-title" id="createFileLabel">Add File</h4> | ||
| 243 | - </div> | ||
| 244 | - <div class="modal-body"> | ||
| 245 | - <!-- Card --> | ||
| 246 | - | ||
| 247 | - <form class="form-horizontal"> | ||
| 248 | - <fieldset> | ||
| 249 | - | ||
| 250 | - <div class="form-group is-empty"> | ||
| 251 | - <label for="inputName" class="col-md-2 control-label">Name</label> | ||
| 252 | - | ||
| 253 | - <div class="col-md-10"> | ||
| 254 | - <input type="text" class="form-control" id="inputText" placeholder="Name"> | ||
| 255 | - </div> | ||
| 256 | - </div> | ||
| 257 | - | ||
| 258 | - <div class="form-group is-empty is-fileinput"> | ||
| 259 | - <label for="inputFile" class="col-md-2 control-label">File</label> | ||
| 260 | - | ||
| 261 | - <div class="col-md-10"> | ||
| 262 | - <input type="text" readonly="" class="form-control" placeholder="Browse..."> | ||
| 263 | - <input type="file" id="inputFile" multiple=""> | ||
| 264 | - </div> | ||
| 265 | - </div> | ||
| 266 | - | ||
| 267 | - | ||
| 268 | - <div class="form-group"> | ||
| 269 | - <div class="col-md-12 text-center"> | ||
| 270 | - <p><b>The file size shouldn't exceed 10MB</b></p> | ||
| 271 | - </div> | ||
| 272 | - </div> | ||
| 273 | - | ||
| 274 | - <div class="form-group"> | ||
| 275 | - <div class="col-md-12"> | ||
| 276 | - <a href="javascript:void(0)" class="btn btn-raised btn-default">Cancel<div class="ripple-container"></div></a> | ||
| 277 | - <a href="javascript:void(0)" class="btn btn-raised btn-primary">Submit</a> | ||
| 278 | - </div> | ||
| 279 | - </div> | ||
| 280 | - </fieldset> | ||
| 281 | - </form> | ||
| 282 | - | ||
| 283 | ->>>>>>> ba384ee6d51624227304d098d60d29248bbd3bbc | ||
| 284 | - | ||
| 285 | - <!-- .end Card --> | ||
| 286 | - </div> | ||
| 287 | - </div> | ||
| 288 | - </div> | ||
| 289 | - </div> | ||
| 290 | - <!-- EndModal --> | ||
| 291 | - | ||
| 292 | <!-- MODAL REMOVE FILE --> | 234 | <!-- MODAL REMOVE FILE --> |
| 293 | <div class="modal" id="removeFileModal"> | 235 | <div class="modal" id="removeFileModal"> |
| 294 | <div class="modal-dialog"> | 236 | <div class="modal-dialog"> |