Download as
Browse Code »

Commit 0155bc3231d9bf98125d4d9d7878701b35f05148

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

exam css

Showing 4 changed files with 14 additions and 8 deletions   Show diff stats
app/templates/home.html
  Diff comments   View file @0155bc3
@@ -13,9 +13,9 @@ @@ -13,9 +13,9 @@
13 var numberPages = 0 ; // Indicates the number of pages 13 var numberPages = 0 ; // Indicates the number of pages
14 {% endif %} 14 {% endif %}
15 var baseUrl = '{% url "app:index" %}'; 15 var baseUrl = '{% url "app:index" %}';
16 - </script>  
17 - <script type="text/javascript" src="{% static 'js/home.js' %}"></script> 16 + </script>
18 {% endif %} 17 {% endif %}
  18 + <script type="text/javascript" src="{% static 'js/home.js' %}"></script>
19 {% endblock %} 19 {% endblock %}
20 20
21 {% block breadcrumbs %} 21 {% block breadcrumbs %}
core/templates/base.html
  Diff comments   View file @0155bc3
@@ -43,7 +43,7 @@ @@ -43,7 +43,7 @@
43 <link rel="stylesheet" type="text/css" href="{% static 'font-awesome-4.6.3/css/font-awesome.min.css' %}"> 43 <link rel="stylesheet" type="text/css" href="{% static 'font-awesome-4.6.3/css/font-awesome.min.css' %}">
44 44
45 <!-- Custom styles --> 45 <!-- Custom styles -->
46 - <link rel="stylesheet" type="text/css" href="{% static 'css/base/amadeus.css' %}"> 46 + <link rel="stylesheet" type="text/css" href="{% static 'css/base/amadeus.css' %}">
47 47
48 <!--Javascript block for specific-app ones --> 48 <!--Javascript block for specific-app ones -->
49 <script src="{% static 'js/base/amadeus.js' %}"></script> 49 <script src="{% static 'js/base/amadeus.js' %}"></script>
exam/static/css/exam.css
  Diff comments   View file @0155bc3
1 .primary-label-TF{ 1 .primary-label-TF{
2 padding-left: 0px; 2 padding-left: 0px;
3 -}  
4 \ No newline at end of file 3 \ No newline at end of file
  4 +}
  5 +.title-questions-exam{padding-left:1.5%;}
5 \ No newline at end of file 6 \ No newline at end of file
exam/templates/exam/create.html
  Diff comments   View file @0155bc3
@@ -2,6 +2,10 @@ @@ -2,6 +2,10 @@
2 2
3 {% load i18n widget_tweaks static django_bootstrap_breadcrumbs %} 3 {% load i18n widget_tweaks static django_bootstrap_breadcrumbs %}
4 4
  5 +{% block style %}
  6 + <link rel="stylesheet" type="text/css" href="{% static 'css/exam.css' %}">
  7 +{% endblock %}
  8 +
5 {% block breadcrumbs %} 9 {% block breadcrumbs %}
6 {{ block.super }} 10 {{ block.super }}
7 {% breadcrumb 'Create exam' 'course:create_exam' %} 11 {% breadcrumb 'Create exam' 'course:create_exam' %}
@@ -56,7 +60,6 @@ @@ -56,7 +60,6 @@
56 </div> 60 </div>
57 </div> 61 </div>
58 </div> 62 </div>
59 -  
60 <div class="row form-group" id="buttonAddQuestion"> 63 <div class="row form-group" id="buttonAddQuestion">
61 <div class="col-md-10"> 64 <div class="col-md-10">
62 <button id="addQuestion" type="button" class="btn btn-raised btn-default">Add new question buton</button> 65 <button id="addQuestion" type="button" class="btn btn-raised btn-default">Add new question buton</button>
@@ -77,6 +80,7 @@ @@ -77,6 +80,7 @@
77 //Insert Create select with question type 80 //Insert Create select with question type
78 var idQuestionType = 1; 81 var idQuestionType = 1;
79 $("#addQuestion").on("click", function(event){ 82 $("#addQuestion").on("click", function(event){
  83 + var title = '<h3 class="title-questions-exam">Choice your questions:</h3><br/>';
80 var element = 84 var element =
81 '<div class="row form-group" id="questionType_' + idQuestionType +'">' + 85 '<div class="row form-group" id="questionType_' + idQuestionType +'">' +
82 '<label for="questionType" class="col-md-2 control-label">' + 86 '<label for="questionType" class="col-md-2 control-label">' +
@@ -90,10 +94,11 @@ @@ -90,10 +94,11 @@
90 '</select>' + 94 '</select>' +
91 '</div>' + 95 '</div>' +
92 '</div>' + '<hr id="hr_'+idQuestionType+'">' 96 '</div>' + '<hr id="hr_'+idQuestionType+'">'
93 - ; 97 + ;
94 if (idQuestionType == 1){ 98 if (idQuestionType == 1){
95 - $(element).insertAfter('#buttonAddQuestion');  
96 - }else{ 99 + $(title).insertBefore('#buttonAddQuestion');
  100 + $(element).insertBefore('#buttonAddQuestion');
  101 + }else{
97 var idhr = '#hr_'+(idQuestionType-1); 102 var idhr = '#hr_'+(idQuestionType-1);
98 $(element).insertAfter(idhr); 103 $(element).insertAfter(idhr);
99 } 104 }