Download as
Browse Code »

Commit f353d024bfaa880a3af2cd88f85ae5bd284dc3ab

Authored by ailsoncgt
2 parents 0c584360 4a7593e5
Exists in master and in 5 other branches amadeus_univasf, dev, image-crop, pdf_file_html, refactoring

merge

Showing 12 changed files with 195 additions and 206 deletions   Show diff stats
core/templates/base.html
  Diff comments   View file @f353d02
... ... @@ -32,7 +32,7 @@
32 32 </script>
33 33 <script src="{% static 'js/base/header.js'%}"></script>
34 34 <!--Javascript block for specific-app ones -->
35   -
  35 +
36 36 </head>
37 37 <body>
38 38 <div class="container-fluid">
... ... @@ -49,7 +49,7 @@
49 49 </div>
50 50 <div class="navbar-collapse collapse navbar-responsive-collapse">
51 51 <ul class="nav navbar-nav navbar-right notifications">
52   - <li class="" data-toggle="tooltip" data-placement="bottom" title data-original-title="notifications">
  52 + <li class="" data-toggle="tooltip" data-placement="bottom" title data-original-title="notifications">
53 53 <a class="dropdown-toggle" data-toggle="dropdown"> <span class="badge notification-count">{{notifications.count}}</span><i class="fa fa-bell" aria-hidden="true"></i></a>
54 54 <ul id="notification-dropdown" class="dropdown-menu">
55 55 <li class="dropdown-header">Notifications</li>
... ... @@ -75,7 +75,7 @@
75 75 <i class="material-icons">folder</i>
76 76 </div>
77 77 <div class="row-content">
78   -
  78 +
79 79 <div class="least-content pull-right">{{ notification.datetime }}</div>
80 80  
81 81 <p class="list-group-item-text">{{ notification.message }}</p>
... ... @@ -99,39 +99,36 @@
99 99 {% endblock %}
100 100  
101 101 <div class="row">
102   - <div class="col-xs-* col-sm-* col-md-2">
  102 + <div class="col-xs-2 col-sm-2 col-md-2 col-lg-2 col-xl-2">
103 103 {% block sidebar %}
104 104  
105 105 {% endblock %}
106 106 </div>
107 107  
108   - <div class="col-xs-* col-sm-* col-md-10">
  108 + <div class="col-xs-10 col-sm-10 col-md-10 col-lg-10 col-xl-10">
109 109 {% block breadcrumbs %}
110 110  
111 111 {% endblock %}
112   -
  112 +
113 113 {% block render_breadcrumbs %}
114 114  
115 115 {% endblock %}
116   - </div>
117   -
118   -
119   -
120   -
121   - <div class="col-xs-* col-sm-* col-md-8">
122   - {% block content %}
  116 + <div class="row">
  117 + <div class="col-xs-9 col-sm-9 col-md-9 col-lg-9 col-xl-9">
  118 + {% block content %}
123 119  
124   - {% endblock %}
125   - </div>
  120 + {% endblock %}
  121 + </div>
  122 +
  123 + <div class="col-xs-3 col-sm-3 col-md-3 col-lg-3 col-xl-3">
  124 + {% block rightbar %}
  125 +
  126 + {% endblock rightbar %}
  127 + </div>
  128 + </div>
  129 + </div>
126 130  
127   - <div class="col-xs-* col-sm-* col-md-2">
128   - {% block rightbar %}
129 131  
130   - {% endblock rightbar %}
131   - </div>
132   -
133   -
134   -
135 132 </div>
136 133 </div>
137 134  
... ...
core/templates/index.html
  Diff comments   View file @f353d02
... ... @@ -11,9 +11,9 @@
11 11  
12 12 {% block content %}
13 13 <div class="row">
14   - <div class="col-md-4 col-md-offset-4">
  14 + <div class="col-sm-4 col-sm-offset-4 col-md-4 col-md-offset-4 col-xs-4 col-xs-offset-4 col-lg-4 col-lg-offset-4 col-xl-4 col-xl-offset-4">
15 15 <div class="row">
16   - <div class="col-md-offset-2 col-md-8">
  16 + <div class="col-sm-8 col-sm-offset-2 col-md-offset-2 col-md-8 col-xs-8 col-xs-offset-2 col-lg-offset-2 col-lg-8 col-xl-offset-2 col-xl-8">
17 17 </br>
18 18 </br>
19 19 <img src="{% static 'img/amadeus.png' %}" class="img-responsive center-block " alt="logo amadeus">
... ... @@ -28,7 +28,7 @@
28 28 </div>
29 29  
30 30 <div class="row ">
31   - <div class="col-md-8 col-md-offset-2 col-sm-6 col-sm-offset-3">
  31 + <div class="col-md-8 col-md-offset-2 col-sm-8 col-sm-offset-2 col-xs-8 col-xs-offset-2 col-lg-8 col-lg-offset-2 col-xl-8 col-xl-offset-2">
32 32 {% if message %}
33 33 <div class="alert alert-danger alert-dismissible" role="alert">
34 34 <button type="button" class="close" data-dismiss="alert" aria-label="Close">
... ... @@ -45,18 +45,18 @@
45 45 <form id="form-login" class="form-group" method="post" action="">
46 46 {% csrf_token %}
47 47 <div class="form-group is-empty">
48   - <label for="inputEmail" class="col-md-4 control-label"> {% trans 'Username' %}</label>
49   - <div class="col-md-8">
  48 + <label for="inputEmail" class="col-md-4 col-xs-4 col-sm-4 col-lg-4 control-label"> {% trans 'Username' %}</label>
  49 + <div class="col-md-8 col-xs-8 col-lg-8 col-sm-8">
50 50 <input form="form-login" type="text" name="username" class="form-control" id="inputEmail" placeholder="Username" value="{% if username %}{{username}}{% endif %}">
51 51 </div>
52 52 </div>
53 53 <div class="form-group is-empty">
54   - <label for="inputPassword" class="col-md-4 control-label"> {% trans 'Password' %}</label>
55   - <div class="col-md-8">
  54 + <label for="inputPassword" class="col-md-4 col-xs-4 col-lg-4 col-sm-4 control-label"> {% trans 'Password' %}</label>
  55 + <div class="col-md-8 col-xs-8 col-lg-8 col-sm-8">
56 56 <input form="form-login" type="password" name="password" class="form-control" id="inputPassword" placeholder="Password">
57 57 </div>
58 58 </div>
59   - <div class="col-md-10">
  59 + <div class="col-md-10 col-sm-10 col-xs-10 col-lg-10">
60 60 <div class="checkbox">
61 61 <label>
62 62 <input form="form-login" type="checkbox" name="checkbox"><span class="checkbox-material"><span class="check"></span></span> {% trans 'Remember Email' %}
... ... @@ -66,25 +66,21 @@
66 66 </form>
67 67 {# </div> #}
68 68 {# <div class="row"> #}
69   - <div class="col-md-10">
  69 + <div class="col-md-10 col-sm-10 col-xs-10 col-lg-10">
70 70 <a href="{% url 'core:remember_password' %}">Forgot your password?</a>
71 71 </div>
72 72 {# </div> #}
73 73 {# <div class="row"> #}
74   - <div class="col-md-6 col-xs-6 text-center">
  74 + <div class="col-md-6 col-xs-6 col-sm-6 col-lg-6 text-center">
75 75 <button type="button" class="btn btn-flat" formaction="#" style="position: initial;">{% trans 'Guest' %}</button>
76 76 </div>
77   - <div class="col-md-6 col-xs-6 text-center">
  77 + <div class="col-md-6 col-xs-6 col-sm-6 col-lg-6 text-center">
78 78 <button type="submite" class="btn btn-flat btn-success" form="form-login" style="position: initial;">{% trans 'Login' %}</button>
79 79 </div>
80 80 {# </div> #}
81 81 </div>
82 82 </div>
83   - </div>
84   - </div>
85   - <div class="row">
86   - <div class="col-lg-offset-2 col-lg-8 col-md-8 col-md-offset-2 col-sm-6 col-sm-offset-3">
87   - <a class="btn btn-raised btn-primary btn-lg btn-block" href="{% url 'core:register' %}">{% trans 'Sign Up' %} </a>
  83 + <a class="btn btn-raised btn-primary btn-block" href="{% url 'core:register' %}">{% trans 'Sign Up' %} </a>
88 84 </div>
89 85 </div>
90 86 </div>
... ...
core/templates/remember_password.html
  Diff comments   View file @f353d02
... ... @@ -3,9 +3,9 @@
3 3 {% block content%}
4 4  
5 5 <div class="row">
6   - <div class="col-md-4 col-md-offset-4">
  6 + <div class="col-md-4 col-md-offset-4 col-xs-4 col-xs-offset-4 col-sm-4 col-sm-offset-4 col-lg-4 col-lg-offset-4 col-xl-4 col-xl-offset-4">
7 7 <div class="row">
8   - <div class="col-md-offset-2 col-md-8">
  8 + <div class="col-md-offset-2 col-md-8 col-sm-offset-2 col-sm-8 col-xs-offset-2 col-xs-8 col-lg-offset-2 col-lg-8 col-xs-offset-2 col-xs-8">
9 9 </br>
10 10 </br>
11 11 <img src="{% static 'img/amadeus.png' %}" class="img-responsive center-block " alt="logo amadeus">
... ... @@ -14,7 +14,7 @@
14 14 </div>
15 15 </div>
16 16 <div class="row ">
17   - <div class="col-lg-9 col-lg-offset-2">
  17 + <div class="col-lg-9 col-lg-offset-2 col-xs-9 col-xs-offset-2 col-sm-9 col-sm-offset-2 col-md-9 col-md-offset-2 col-xl-9 col-xl-offset-2">
18 18 {% if success %}
19 19 <div class="alert alert-success alert-dismissible" role="alert">
20 20 <button type="button" class="close" data-dismiss="alert" aria-label="Close">
... ... @@ -36,23 +36,19 @@
36 36 {% endif %}
37 37 <div class="card">
38 38 <div class="card-block">
39   - <div class="col-md-12">
  39 + <div class="col-md-12 col-xs-12 col-sm-12 col-lg-12 col-xl-12">
40 40 <form class="form-group " method="post" action="">
41 41 {% csrf_token %}
42 42 <div class="form-group is-empty">
43 43 <label for="inputEmail" class="ccontrol-label"> {% trans 'E-mail' %}</label>
44   - {# <div class="col-md-8"> #}
45 44 <input name="email" type="email" class="form-control" id="inputEmail" placeholder="Email" {% if email %}value="{{email}}"{% endif %}>
46   - {# </div> #}
47 45 </div>
48 46 <div class="form-group is-empty">
49 47 <label for="inputRegistration" class="control-label"> {% trans 'Registration' %} </label>
50   - {# <div class="col-md-8"> #}
51   - <input name="registration" type="text" class="col-md-4 form-control" id="inputRegistration" placeholder="Registration" {% if registration %}value="{{registration}}"{% endif %}>
52   - {# </div> #}
  48 + <input name="registration" type="text" class="col-md-4 col-xs-4 col-sm-4 col-lg-4 col-xl-4 form-control" id="inputRegistration" placeholder="Registration" {% if registration %}value="{{registration}}"{% endif %}>
53 49 </div>
54   - <div class="col-lg-offset-4 col-lg-4">
55   - <button type="submite" class="btn btn-raised btn-primary btn-lg btn-block">{% trans 'Send' %}</button>
  50 + <div class="col-lg-offset-4 col-lg-4 col-xs-offset-4 col-xs-4 col-sm-offset-4 col-sm-4 col-md-offset-4 col-md-4 col-xl-offset-4 col-xl-4">
  51 + <button type="submite" class="btn btn-raised btn-primary btn-block">{% trans 'Send' %}</button>
56 52  
57 53 </div>
58 54 </form>
... ...
forum/templates/forum/forum_form.html 0 → 100644
  Diff comments   View file @f353d02
... ... @@ -0,0 +1,30 @@
  1 +{% load static i18n %}
  2 +{% load widget_tweaks %}
  3 +
  4 +<form method="post" action="" enctype="multipart/form-data">
  5 + {% csrf_token %}
  6 + {% for field in form %}
  7 + <div class="form-group {% if form.has_error %} has-error {% endif %} is-fileinput">
  8 + <label for="{{ field.auto_id }}">{{ field.label }}</label>
  9 + {% render_field field class='form-control' %}
  10 + <span class="help-block">{{ field.help_text }}</span>
  11 + {% if field.errors %}
  12 + <div class="row">
  13 + <br />
  14 + <div class="alert alert-danger alert-dismissible" role="alert">
  15 + <button type="button" class="close" data-dismiss="alert" aria-label="Close">
  16 + <span aria-hidden="true">&times;</span>
  17 + </button>
  18 + <ul>
  19 + {% for error in field.errors %}
  20 + <li>{{ error }}</li>
  21 + {% endfor %}
  22 + </ul>
  23 + </div>
  24 + </div>
  25 + {% endif %}
  26 + </div>
  27 + {% endfor %}
  28 +
  29 + <input type="submit" value="{% trans 'Create' %}" class="btn btn-primary" />
  30 +</form>
0 31 \ No newline at end of file
... ...
forum/templates/forum/forum_list.html 0 → 100644
  Diff comments   View file @f353d02
... ... @@ -0,0 +1,36 @@
  1 +{% load i18n permission_tags %}
  2 +
  3 +{% if foruns|length > 0 %}
  4 + {% for forum in foruns %}
  5 + <a class="forum_collapse" role="button" href="javascript: showPosts('{% url 'forum:posts' %}', '{{ forum.slug }}')" aria-expanded="true">
  6 + <div class="page-header">
  7 + <!-- {% if user|has_role:'system_admin' or user|has_role:'professor' and user == forum.topic.owner %}
  8 + <div class="pull-right">
  9 + <div class="btn-group icon-more-horiz">
  10 + <button class="btn btn-default btn-xs dropdown-toggle" type="button" onclick="$('#dropdown{{ forum.slug }}').dropdown('toggle');" data-toggle="dropdown">
  11 + <i class="material-icons">more_horiz</i>
  12 + </button>
  13 + <ul class="dropdown-menu" id="dropdown{{ forum.slug }}">
  14 + <li><a href="javascript:void(0)"><i class="material-icons">create</i> Edit</a></li>
  15 + <li><a href="javascript:void(0)"><i class="material-icons">delete_sweep</i> Remove</a></li>
  16 + </ul>
  17 + </div>
  18 + </div>
  19 + {% endif %} -->
  20 + <h1 id="timeline">
  21 + {{ forum }}
  22 + </h1>
  23 + <b>{% trans 'Description' %}: </b>{{ forum.description }}<p>
  24 + <b>{% trans 'Created in' %}: </b>{{ forum.create_date }}
  25 + </div>
  26 + </a>
  27 + <div class="collapse" id="collapse{{ forum.slug }}">
  28 + <div class="well">
  29 + </div>
  30 + </div>
  31 + {% endfor %}
  32 +{% else %}
  33 + <div class="page-header">
  34 + <p>{% trans 'No forum created yet.' %}</p>
  35 + </div>
  36 +{% endif %}
... ...
forum/templates/forum_form.html
View file @0c58436
... ... @@ -1,30 +0,0 @@
1   -{% load static i18n %}
2   -{% load widget_tweaks %}
3   -
4   -<form method="post" action="" enctype="multipart/form-data">
5   - {% csrf_token %}
6   - {% for field in form %}
7   - <div class="form-group {% if form.has_error %} has-error {% endif %} is-fileinput">
8   - <label for="{{ field.auto_id }}">{{ field.label }}</label>
9   - {% render_field field class='form-control' %}
10   - <span class="help-block">{{ field.help_text }}</span>
11   - {% if field.errors %}
12   - <div class="row">
13   - <br />
14   - <div class="alert alert-danger alert-dismissible" role="alert">
15   - <button type="button" class="close" data-dismiss="alert" aria-label="Close">
16   - <span aria-hidden="true">&times;</span>
17   - </button>
18   - <ul>
19   - {% for error in field.errors %}
20   - <li>{{ error }}</li>
21   - {% endfor %}
22   - </ul>
23   - </div>
24   - </div>
25   - {% endif %}
26   - </div>
27   - {% endfor %}
28   -
29   - <input type="submit" value="{% trans 'Create' %}" class="btn btn-primary" />
30   -</form>
31 0 \ No newline at end of file
forum/templates/forum_list.html
View file @0c58436
... ... @@ -1,36 +0,0 @@
1   -{% load i18n permission_tags %}
2   -
3   -{% if foruns|length > 0 %}
4   - {% for forum in foruns %}
5   - <a class="forum_collapse" role="button" href="javascript: showPosts('{% url 'forum:posts' %}', '{{ forum.slug }}')" aria-expanded="true">
6   - <div class="page-header">
7   - <!-- {% if user|has_role:'system_admin' or user|has_role:'professor' and user == forum.topic.owner %}
8   - <div class="pull-right">
9   - <div class="btn-group icon-more-horiz">
10   - <button class="btn btn-default btn-xs dropdown-toggle" type="button" onclick="$('#dropdown{{ forum.slug }}').dropdown('toggle');" data-toggle="dropdown">
11   - <i class="material-icons">more_horiz</i>
12   - </button>
13   - <ul class="dropdown-menu" id="dropdown{{ forum.slug }}">
14   - <li><a href="javascript:void(0)"><i class="material-icons">create</i> Edit</a></li>
15   - <li><a href="javascript:void(0)"><i class="material-icons">delete_sweep</i> Remove</a></li>
16   - </ul>
17   - </div>
18   - </div>
19   - {% endif %} -->
20   - <h1 id="timeline">
21   - {{ forum }}
22   - </h1>
23   - <b>{% trans 'Description' %}: </b>{{ forum.description }}<p>
24   - <b>{% trans 'Created in' %}: </b>{{ forum.create_date }}
25   - </div>
26   - </a>
27   - <div class="collapse" id="collapse{{ forum.slug }}">
28   - <div class="well">
29   - </div>
30   - </div>
31   - {% endfor %}
32   -{% else %}
33   - <div class="page-header">
34   - <p>{% trans 'No forum created yet.' %}</p>
35   - </div>
36   -{% endif %}
forum/templates/post/post_list.html 0 → 100644
  Diff comments   View file @f353d02
... ... @@ -0,0 +1,40 @@
  1 +{% load i18n permission_tags %}
  2 +
  3 +{% if posts|length > 0 %}
  4 + <ul class="timeline post">
  5 + {% for post in posts %}
  6 + <li>
  7 + <a class="post_collapse" role="button" href="javascript: showPostsAnswers('{% url 'forum:post_answers' %}', '{{ post.id }}')" aria-expanded="false">
  8 + <div class="timeline-panel">
  9 + <div class="row">
  10 + <div class="col-xs-2 col-sm-2 col-md-2">
  11 + <img class="img-responsive img-rounded" src="{{ post.user.image_url }}" />
  12 + </div>
  13 + <div class="col-xs-10 col-sm-10 col-md-10">
  14 + <div class="timeline-heading">
  15 + <h3> {{ post.user }}</h3>
  16 + </div>
  17 + <div class="timeline-body">
  18 + <p><em>{{ post.message|linebreaks }}</em></p>
  19 + </div>
  20 + <hr>
  21 + <small class="text-muted">
  22 + <span class="pull-right">
  23 + <i class="glyphicon glyphicon-time"></i> {{ post.post_date|timesince }}
  24 + {% trans ' ago' %}
  25 + </span>
  26 + </small>
  27 + </div>
  28 + </div>
  29 + </div>
  30 + </a>
  31 + <div class="collapse" id="collapse{{ post.id }}" style="margin-top:10px;">
  32 + <div class="well">
  33 + </div>
  34 + </div>
  35 + </li>
  36 + {% endfor %}
  37 + </ul>
  38 +{% else %}
  39 + <p>{% trans 'No posts were made yet.' %}</p>
  40 +{% endif %}
0 41 \ No newline at end of file
... ...
forum/templates/post_answer_list.html
View file @0c58436
... ... @@ -1,47 +0,0 @@
1   -{% load i18n permission_tags %}
2   -
3   -{% if answers|length > 0 %}
4   - <ul class="timeline post">
5   - {% for answer in answers %}
6   - <li>
7   - <div class="timeline-panel">
8   - <div class="row">
9   - <div class="col-xs-2 col-sm-2 col-md-2">
10   - <img class="img-responsive img-rounded" src="{{ answer.user.image_url }}" />
11   - </div>
12   - <div class="col-xs-10 col-sm-10 col-md-10">
13   - {% if user|has_role:'system_admin' or user|has_role:'professor' and user == forum.topic.owner %}
14   - <div class="pull-right">
15   - <div class="btn-group icon-more-horiz">
16   - <a class="btn btn-default btn-xs dropdown-toggle" type="button" id="dropdownMenu1" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
17   - <i class="material-icons">more_horiz</i>
18   - </a>
19   - <ul class="dropdown-menu" aria-labelledby="dropdownMenu1">
20   - <li><a href="javascript:void(0)"><i class="material-icons">create</i> Edit</a></li>
21   - <li><a href="javascript:void(0)"><i class="material-icons">delete_sweep</i> Remove</a></li>
22   - </ul>
23   - </div>
24   - </div>
25   - {% endif %}
26   - <div class="timeline-heading">
27   - <h3> {{ answer.user }}</h3>
28   - </div>
29   - <div class="timeline-body">
30   - <p><em>{{ answer.message|linebreaks }}</em></p>
31   - </div>
32   - <hr>
33   - <small class="text-muted">
34   - <span class="pull-right">
35   - <i class="glyphicon glyphicon-time"></i> {{ answer.answer_date|timesince }}
36   - {% trans ' ago' %}
37   - </span>
38   - </small>
39   - </div>
40   - </div>
41   - </div>
42   - </li>
43   - {% endfor %}
44   - </ul>
45   -{% else %}
46   - <p>{% trans 'Nobody answered this post yet.' %}</p>
47   -{% endif %}
48 0 \ No newline at end of file
forum/templates/post_answers/post_answer_list.html 0 → 100644
  Diff comments   View file @f353d02
... ... @@ -0,0 +1,47 @@
  1 +{% load i18n permission_tags %}
  2 +
  3 +{% if answers|length > 0 %}
  4 + <ul class="timeline post">
  5 + {% for answer in answers %}
  6 + <li>
  7 + <div class="timeline-panel">
  8 + <div class="row">
  9 + <div class="col-xs-2 col-sm-2 col-md-2">
  10 + <img class="img-responsive img-rounded" src="{{ answer.user.image_url }}" />
  11 + </div>
  12 + <div class="col-xs-10 col-sm-10 col-md-10">
  13 + {% if user|has_role:'system_admin' or user|has_role:'professor' and user == forum.topic.owner %}
  14 + <div class="pull-right">
  15 + <div class="btn-group icon-more-horiz">
  16 + <a class="btn btn-default btn-xs dropdown-toggle" type="button" id="dropdownMenu1" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
  17 + <i class="material-icons">more_horiz</i>
  18 + </a>
  19 + <ul class="dropdown-menu" aria-labelledby="dropdownMenu1">
  20 + <li><a href="javascript:void(0)"><i class="material-icons">create</i> Edit</a></li>
  21 + <li><a href="javascript:void(0)"><i class="material-icons">delete_sweep</i> Remove</a></li>
  22 + </ul>
  23 + </div>
  24 + </div>
  25 + {% endif %}
  26 + <div class="timeline-heading">
  27 + <h3> {{ answer.user }}</h3>
  28 + </div>
  29 + <div class="timeline-body">
  30 + <p><em>{{ answer.message|linebreaks }}</em></p>
  31 + </div>
  32 + <hr>
  33 + <small class="text-muted">
  34 + <span class="pull-right">
  35 + <i class="glyphicon glyphicon-time"></i> {{ answer.answer_date|timesince }}
  36 + {% trans ' ago' %}
  37 + </span>
  38 + </small>
  39 + </div>
  40 + </div>
  41 + </div>
  42 + </li>
  43 + {% endfor %}
  44 + </ul>
  45 +{% else %}
  46 + <p>{% trans 'Nobody answered this post yet.' %}</p>
  47 +{% endif %}
0 48 \ No newline at end of file
... ...
forum/templates/post_list.html
View file @0c58436
... ... @@ -1,40 +0,0 @@
1   -{% load i18n permission_tags %}
2   -
3   -{% if posts|length > 0 %}
4   - <ul class="timeline post">
5   - {% for post in posts %}
6   - <li>
7   - <a class="post_collapse" role="button" href="javascript: showPostsAnswers('{% url 'forum:post_answers' %}', '{{ post.id }}')" aria-expanded="false">
8   - <div class="timeline-panel">
9   - <div class="row">
10   - <div class="col-xs-2 col-sm-2 col-md-2">
11   - <img class="img-responsive img-rounded" src="{{ post.user.image_url }}" />
12   - </div>
13   - <div class="col-xs-10 col-sm-10 col-md-10">
14   - <div class="timeline-heading">
15   - <h3> {{ post.user }}</h3>
16   - </div>
17   - <div class="timeline-body">
18   - <p><em>{{ post.message|linebreaks }}</em></p>
19   - </div>
20   - <hr>
21   - <small class="text-muted">
22   - <span class="pull-right">
23   - <i class="glyphicon glyphicon-time"></i> {{ post.post_date|timesince }}
24   - {% trans ' ago' %}
25   - </span>
26   - </small>
27   - </div>
28   - </div>
29   - </div>
30   - </a>
31   - <div class="collapse" id="collapse{{ post.id }}" style="margin-top:10px;">
32   - <div class="well">
33   - </div>
34   - </div>
35   - </li>
36   - {% endfor %}
37   - </ul>
38   -{% else %}
39   - <p>{% trans 'No posts were made yet.' %}</p>
40   -{% endif %}
41 0 \ No newline at end of file
forum/views.py
  Diff comments   View file @f353d02
... ... @@ -13,7 +13,7 @@ class ForumIndex(LoginRequiredMixin, generic.ListView):
13 13 login_url = reverse_lazy("core:home")
14 14 redirect_field_name = 'next'
15 15  
16   - template_name = "forum_list.html"
  16 + template_name = "forum/forum_list.html"
17 17 context_object_name = 'foruns'
18 18  
19 19 def get_queryset(self):
... ... @@ -25,7 +25,7 @@ class ForumIndex(LoginRequiredMixin, generic.ListView):
25 25  
26 26 class CreateForumView(LoginRequiredMixin, generic.edit.CreateView):
27 27  
28   - template_name = 'forum_form.html'
  28 + template_name = 'forum/forum_form.html'
29 29 form_class = ForumForm
30 30 success_url = reverse_lazy('forum:index')
31 31  
... ... @@ -33,7 +33,7 @@ class PostIndex(LoginRequiredMixin, generic.ListView):
33 33 login_url = reverse_lazy("core:home")
34 34 redirect_field_name = 'next'
35 35  
36   - template_name = "post_list.html"
  36 + template_name = "post/post_list.html"
37 37 context_object_name = 'posts'
38 38  
39 39 def get_queryset(self):
... ... @@ -47,7 +47,7 @@ class PostAnswerIndex(LoginRequiredMixin, generic.ListView):
47 47 login_url = reverse_lazy("core:home")
48 48 redirect_field_name = 'next'
49 49  
50   - template_name = "post_answer_list.html"
  50 + template_name = "post_answers/post_answer_list.html"
51 51 context_object_name = 'answers'
52 52  
53 53 def get_queryset(self):
... ...