Download as
Browse Code »

Commit 68badb4bbc12e2779f5d5af85fd2e31198fdfc27

Authored by fbormann
2 parents ba872321 4a4e0103
Exists in master and in 5 other branches amadeus_univasf, dev, image-crop, pdf_file_html, refactoring

Merge branch 'master' of https://github.com/amadeusproject/amadeuslms

Showing 2 changed files with 49 additions and 21 deletions   Show diff stats
core/static/css/base/amadeus.css
  Diff comments   View file @68badb4
... ... @@ -272,6 +272,9 @@ a.alert_message:hover{color : grey}
272 272 background: #e0e0e0;
273 273 }
274 274  
  275 +body .container .jumbotron-inverse, body .container .well-inverse, body .container-fluid .jumbotron-inverse, body .container-fluid .well-inverse {
  276 + background-color: white;
  277 +}
275 278 .forum_collapse {
276 279 color: #000;
277 280 }
... ...
courses/templates/course/index.html
  Diff comments   View file @68badb4
... ... @@ -52,50 +52,75 @@
52 52  
53 53 {% if courses|length > 0 %}
54 54 {% for course in courses %}
55   - <div class="row well well-inverse">
56   - <div class="col-md-2">
57   - {% if course.image %}
58   - <img src="{{ course.image.url }}" class="img-responsive" />
59   - {% else %}
60   - <img src="" class="img-responsive" />
61   - {% endif %}
62   - </div>
  55 + <div class="col-md-12">
  56 + <div class="panel panel-info">
  57 + <!--{% if course.image %}
  58 + <img src="{{ course.image_url }}" class="img-responsive" />
  59 + {% else %}
  60 + <img src="" class="img-responsive" />
  61 + {% endif %} -->
  62 + <div class="panel-heading">
  63 + <h3 class="panel-title">Course</h3>
  64 + <span class="label label-info">{{ course.category }}</span>
  65 + <span class="label label-warning">{{ course.max_students }} {% trans 'students tops' %}</span>
  66 + </div>
  67 + <div class="panel-body">
  68 + <p><b>Course Name: </b>{{ course.name }}</p>
  69 + <p><b>Duration (in semesters): </b>09</p>
  70 + <p><b>Coordinator: </b>Alan Turing</p>
  71 + <p>
  72 + <b>Description:</b>
  73 + <i>
  74 + "Lorem ipsum dolor sit amet, consecctetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
  75 + </i>
  76 + </p>
  77 +
  78 + {% if user|has_role:'professor, system_admin' %}
  79 + <a href="{% url 'course:update' course.slug %}" class="btn btn-sm btn-primary">
  80 + <span class="glyphicon glyphicon-edit"></span>
  81 + </a>
  82 + <a href="{% url 'course:delete' course.slug %}" class="btn btn-sm btn-danger">
  83 + <span class="glyphicon glyphicon-trash"></span>
  84 + </a>
  85 + {% endif %}
  86 +
  87 + <a href="course_detail_student.html" class="btn btn-raised btn-default center-block">View Course</a>
  88 +
  89 + </div>
  90 + </div>
  91 + </div>
  92 + <div class="row">
63 93 <div class="col-md-10">
64 94 <div class="row">
65   - <div class="col-md-12">
  95 + <!--<div class="col-md-12">
66 96 <div class="pull-right">
67 97 <a href="{% url 'course:view' course.slug %}" class="btn btn-sm btn-info">
68 98 <span class="glyphicon glyphicon-eye-open"></span>
69 99 </a>
70   - {% if user|has_role:'professor, system_admin' %}
71   - <a href="{% url 'course:update' course.slug %}" class="btn btn-sm btn-primary">
72   - <span class="glyphicon glyphicon-edit"></span>
73   - </a>
74   - <a href="{% url 'course:delete' course.slug %}" class="btn btn-sm btn-danger">
75   - <span class="glyphicon glyphicon-trash"></span>
76   - </a>
77   - {% endif %}
  100 +
78 101 </div>
79 102 <h4>
80 103 <a href="{% url 'course:view' course.slug %}">
81 104 {{ course }}
82 105 </a>
83 106 </h4>
84   - <span class="label label-info">{{ course.category }}</span>
85   - <span class="label label-warning">{{ course.max_students }} {% trans 'students tops' %}</span>
  107 +
86 108 <small>
87 109 <em>{{ course.objectivies|linebreaks }}</em>
88 110 </small>
89 111 </div>
90   - <div class="col-md-12">
  112 + <div class="col-md-12">
91 113 <strong>{% trans 'Subscribe Period:' %} </strong> <em>de</em> <u>{{ course.init_register_date }}</u> <em>até</em> <u>{{ course.end_register_date }}</u>
92 114 <br />
93 115 <strong>{% trans 'Period:' %} </strong> <em>de</em> <u>{{ course.init_date }}</u> <em>até</em> <u>{{ course.end_date }}</u>
94   - </div>
  116 + </div> -->
95 117 </div>
96 118 </div>
97 119 </div>
  120 +
98 121 {% endfor %}
  122 +
  123 +
99 124 <nav aria-label="Page navigation">
100 125 <ul class="pagination">
101 126 {% for page_number in paginator.page_range %}
... ...