Commit 8d9d0354fcee04806b4260cc5cabb0aadee0ff04
Committed by
GitHub
Exists in
amadeus_univasf
Merge pull request #588 from amadeusproject/refactoring
Daily Update - 16_10_2017
Showing
23 changed files
with
12781 additions
and
65 deletions
Show diff stats
amadeus/static/css/base/amadeus_responsive.css
... | ... | @@ -91,6 +91,30 @@ |
91 | 91 | } |
92 | 92 | |
93 | 93 | @media(max-width: 768px) { |
94 | + /* Buttons */ | |
95 | + .visible-xs-block { | |
96 | + margin: 10px auto; | |
97 | + } | |
98 | + | |
99 | + .btn-mobile { | |
100 | + padding: 5px 20px; | |
101 | + font-size: 12px; | |
102 | + } | |
103 | + | |
104 | + .btn-popover-mobile { | |
105 | + padding: 4px 15px; | |
106 | + font-size: 10px; | |
107 | + } | |
108 | + /* End Buttons */ | |
109 | + | |
110 | + .subject-period { | |
111 | + font-size: 12px; | |
112 | + } | |
113 | + | |
114 | + .mural .mural-list { | |
115 | + padding: 0px; | |
116 | + } | |
117 | + | |
94 | 118 | .navbar .project_name{ |
95 | 119 | display: block !important; |
96 | 120 | } |
... | ... | @@ -494,6 +518,10 @@ |
494 | 518 | } |
495 | 519 | |
496 | 520 | @media(min-width: 769px) { |
521 | + .btn-popover-mobile { | |
522 | + padding: 5px 20px; | |
523 | + font-size: 12px; | |
524 | + } | |
497 | 525 | |
498 | 526 | #profile-menu{ |
499 | 527 | float:right; | ... | ... |
No preview for this file type
91.9 KB
amadeus/static/img/themes/black.png
69 KB
104 KB
amadeus/static/img/themes/green.png
69.3 KB
96.2 KB
amadeus/static/img/themes/red.png
71.4 KB
amadeus/static/js/mural.js
... | ... | @@ -31,6 +31,9 @@ $(function () { |
31 | 31 | function setUserDataPopover() { |
32 | 32 | $('[data-toggle="popover"]').popover({ |
33 | 33 | html: true, |
34 | + placement: function () { | |
35 | + return window.innerWidth <= 768 ? 'bottom' : 'right'; | |
36 | + }, | |
34 | 37 | content: function () { |
35 | 38 | return $(this).parent().find(".popover").html(); |
36 | 39 | } | ... | ... |
bulletin/templates/bulletin/view.html
... | ... | @@ -171,9 +171,19 @@ |
171 | 171 | </div> |
172 | 172 | |
173 | 173 | <div class="row" style="padding-left: 10px;"> |
174 | - <div class="col-md-7" > | |
174 | + <div class="col-md-2" > | |
175 | 175 | <div class="row"> |
176 | - <div id="bullet_chart"> </div> | |
176 | + <div id="bullet_chart1" > </div> | |
177 | + </div> | |
178 | + </div> | |
179 | + <div class="col-md-2"> | |
180 | + <div class="row"> | |
181 | + <div id="bullet_chart2"> </div> | |
182 | + </div> | |
183 | + </div> | |
184 | + <div class="col-md-3"> | |
185 | + <div class="row"> | |
186 | + <div id="bullet_chart3"> </div> | |
177 | 187 | </div> |
178 | 188 | </div> |
179 | 189 | <div class="col-md-5"> |
... | ... | @@ -441,11 +451,11 @@ |
441 | 451 | var ind06 = [{valor: dataset[5].valor, mediana: dataset[5].mediana, maximo: dataset[5].maximo}]; |
442 | 452 | |
443 | 453 | // Variáveis de largura e altura da área de desenho do SVG |
444 | - var w = 110; | |
445 | - var h = 350; | |
454 | + var w = 100; | |
455 | + var h = 3*w; | |
446 | 456 | |
447 | 457 | // Margens |
448 | - var margin = {top: 40,bottom: 40,left: 40,right: 10}; | |
458 | + var margin = {top: w/3,bottom: w/3,left: w/3,right: w/12}; | |
449 | 459 | |
450 | 460 | // Definindo a área em que o gráfico será construído dentro da área de desenho |
451 | 461 | var width = w - margin.left - margin.right; |
... | ... | @@ -492,15 +502,17 @@ |
492 | 502 | |
493 | 503 | |
494 | 504 | // Definindo o objeto SVG |
495 | - var svg = d3.select("#bullet_chart").append("svg").attr("id", "bullet_chart1").attr("width", 6*w).attr("height", h); | |
505 | + var svg = d3.select("#bullet_chart1").append("svg").attr("id", "bullet_chart").attr("width", 6*w).attr("height", h); | |
506 | + var svg2 = d3.select("#bullet_chart2").append("svg").attr("id", "bullet_chart").attr("width", 6*w).attr("height", h); | |
507 | + var svg3 = d3.select("#bullet_chart3").append("svg").attr("id", "bullet_chart").attr("width", 6*w).attr("height", h); | |
496 | 508 | |
497 | 509 | // Definindo um objeto SVG agrupado |
498 | 510 | var bullet_chart = svg.append("g").classed("display", true).attr("transform", "translate(" + margin.left + "," + margin.top + ")"); |
499 | - var bullet_chart2 = svg.append("g").classed("display", true).attr("transform", "translate(" + (margin.left+w) + "," + margin.top + ")"); | |
500 | - var bullet_chart3 = svg.append("g").classed("display", true).attr("transform", "translate(" + (margin.left+2*w) + "," + margin.top + ")"); | |
501 | - var bullet_chart4 = svg.append("g").classed("display", true).attr("transform", "translate(" + (margin.left+3*w) + "," + margin.top + ")"); | |
502 | - var bullet_chart5 = svg.append("g").classed("display", true).attr("transform", "translate(" + (margin.left+4*w) + "," + margin.top + ")"); | |
503 | - var bullet_chart6 = svg.append("g").classed("display", true).attr("transform", "translate(" + (margin.left+5*w) + "," + margin.top + ")"); | |
511 | + var bullet_chart2 = svg.append("g").classed("display", true).attr("transform", "translate(" + (margin.left + w) + "," + margin.top + ")"); | |
512 | + var bullet_chart3 = svg2.append("g").classed("display", true).attr("transform", "translate(" + margin.left + "," + margin.top + ")"); | |
513 | + var bullet_chart4 = svg2.append("g").classed("display", true).attr("transform", "translate(" + (margin.left + w) + "," + margin.top + ")"); | |
514 | + var bullet_chart5 = svg3.append("g").classed("display", true).attr("transform", "translate(" + margin.left + "," + margin.top + ")"); | |
515 | + var bullet_chart6 = svg3.append("g").classed("display", true).attr("transform", "translate(" + (margin.left + w) + "," + margin.top + ")"); | |
504 | 516 | |
505 | 517 | // Definindo o objeto tooltip |
506 | 518 | var tooltip = d3.select("body").append("div").attr("class", "toolTip"); | ... | ... |
chat/templates/chat/list.html
... | ... | @@ -32,7 +32,7 @@ |
32 | 32 | </form> |
33 | 33 | </div> |
34 | 34 | <div class="col-lg-4 col-md-4 col-sm-5 col-xs-12"> |
35 | - <a href="{% url 'chat:participants_general' %}" class="pull-right btn btn-default btn-raised btn-md">{% trans 'List all participants' %}</a> | |
35 | + <a href="{% url 'chat:participants_general' %}" class="pull-right btn btn-default btn-raised btn-md btn-mobile visible-xs-block visible-sm-block">{% trans 'List all participants' %}</a> | |
36 | 36 | </div> |
37 | 37 | </div> |
38 | 38 | </div> | ... | ... |
chat/templates/chat/list_participants.html
... | ... | @@ -34,7 +34,7 @@ |
34 | 34 | </form> |
35 | 35 | </div> |
36 | 36 | <div class="col-lg-4 col-md-4 col-sm-5 col-xs-12"> |
37 | - <a href="{% url 'chat:participants_general' %}" class="pull-right btn btn-default btn-raised btn-md">{% trans 'List all participants' %}</a> | |
37 | + <a href="{% url 'chat:participants_general' %}" class="pull-right btn btn-default btn-raised btn-md btn-mobile visible-xs-block visible-sm-block">{% trans 'List all participants' %}</a> | |
38 | 38 | </div> |
39 | 39 | </div> |
40 | 40 | </div> | ... | ... |
mural/templates/mural/_view.html
... | ... | @@ -18,18 +18,18 @@ |
18 | 18 | |
19 | 19 | <br clear="all" /> |
20 | 20 | |
21 | - <div class="col-md-3 col-sm-3 user-img"> | |
21 | + <div class="col-md-3 col-sm-3 col-xs-3 user-img"> | |
22 | 22 | <img src="{{ post.user.image_url }}" class="img-responsive" /> |
23 | 23 | </div> |
24 | - <div class="col-md-9 col-sm-9 user-info"> | |
24 | + <div class="col-md-9 col-sm-9 col-xs-9 user-info"> | |
25 | 25 | <h4><a class="status {{ status }}" data-toggle="tooltip" title="{{ status|status_text }}"></a> {{ post.user }}</h4> |
26 | 26 | </div> |
27 | 27 | </div> |
28 | 28 | <div class="popover-footer"> |
29 | - <a href="#" onclick="getModalInfo($(this), '{{ post|chat_space }}', '{{ post|chat_space_type }}'); return false;" data-url='{% url "chat:profile" post.user.email %}' class="btn btn-default btn-sm btn-raised pull-left"> | |
29 | + <a href="#" onclick="getModalInfo($(this), '{{ post|chat_space }}', '{{ post|chat_space_type }}'); return false;" data-url='{% url "chat:profile" post.user.email %}' class="btn btn-default btn-raised pull-left btn-popover-mobile"> | |
30 | 30 | {% trans 'See Profile' %} |
31 | 31 | </a> |
32 | - <a href="#" onclick="getModalInfo($(this), '{{ post|chat_space }}', '{{ post|chat_space_type }}'); return false;" data-url='{% url "chat:talk" post.user.email %}' class="btn btn-success btn-sm btn-raised pull-right"> | |
32 | + <a href="#" onclick="getModalInfo($(this), '{{ post|chat_space }}', '{{ post|chat_space_type }}'); return false;" data-url='{% url "chat:talk" post.user.email %}' class="btn btn-success btn-raised pull-right btn-popover-mobile"> | |
33 | 33 | {% trans 'Send Message' %} |
34 | 34 | </a> |
35 | 35 | </div> | ... | ... |
mural/templates/mural/_view_comment.html
... | ... | @@ -19,18 +19,18 @@ |
19 | 19 | |
20 | 20 | <br clear="all" /> |
21 | 21 | |
22 | - <div class="col-md-3 col-sm-3 user-img"> | |
22 | + <div class="col-md-3 col-sm-3 col-xs-3 user-img"> | |
23 | 23 | <img src="{{ comment.user.image_url }}" class="img-responsive" /> |
24 | 24 | </div> |
25 | - <div class="col-md-9 col-sm-9 user-info"> | |
25 | + <div class="col-md-9 col-sm-9 col-xs-9 user-info"> | |
26 | 26 | <h4><a class="status {{ status }}" data-toggle="tooltip" title="{{ status|status_text }}"></a> {{ comment.user }}</h4> |
27 | 27 | </div> |
28 | 28 | </div> |
29 | 29 | <div class="popover-footer"> |
30 | - <a href="#" onclick="getModalInfo($(this), '{{ comment.post|chat_space }}', '{{ comment.post|chat_space_type }}'); return false;" data-url='{% url "chat:profile" comment.user.email %}' class="btn btn-default btn-sm btn-raised pull-left"> | |
30 | + <a href="#" onclick="getModalInfo($(this), '{{ comment.post|chat_space }}', '{{ comment.post|chat_space_type }}'); return false;" data-url='{% url "chat:profile" comment.user.email %}' class="btn btn-default btn-raised pull-left btn-popover-mobile"> | |
31 | 31 | {% trans 'See Profile' %} |
32 | 32 | </a> |
33 | - <a href="#" onclick="getModalInfo($(this), '{{ comment.post|chat_space }}', '{{ comment.post|chat_space_type }}'); return false;" data-url='{% url "chat:talk" comment.user.email %}' class="btn btn-success btn-sm btn-raised pull-right"> | |
33 | + <a href="#" onclick="getModalInfo($(this), '{{ comment.post|chat_space }}', '{{ comment.post|chat_space_type }}'); return false;" data-url='{% url "chat:talk" comment.user.email %}' class="btn btn-success btn-raised pull-right btn-popover-mobile"> | |
34 | 34 | {% trans 'Send Message' %} |
35 | 35 | </a> |
36 | 36 | </div> | ... | ... |
mural/templates/mural/list.html
... | ... | @@ -21,7 +21,7 @@ |
21 | 21 | </div> |
22 | 22 | |
23 | 23 | <div class="col-md-12 cards-content mural" data-url="{% url 'mural:manage_general' %}" data-pages="{{ paginator.num_pages }}" data-page="{{ page_obj.number }}" data-fav="{{ favorites }}" data-mine="{{ mines }}"> |
24 | - <div class="col-sm-12 col-xs-12 visible-xs visible-sm" style="padding-left: 0px"> | |
24 | + <div class="col-sm-12 col-xs-12 visible-xs visible-sm" style="padding: 0px"> | |
25 | 25 | <div class="post-filter post-filter-small"> |
26 | 26 | <h4>{% trans 'Filter' %}</h4> |
27 | 27 | ... | ... |
mural/templates/mural/list_category.html
... | ... | @@ -70,7 +70,7 @@ |
70 | 70 | <input type="hidden" class="log_id" value="" /> |
71 | 71 | |
72 | 72 | <div class="col-md-12 cards-content mural" data-url="{% url 'mural:load_category' category.id %}"> |
73 | - <div class="col-sm-12 col-xs-12 visible-xs visible-sm" style="padding-left: 0px"> | |
73 | + <div class="col-sm-12 col-xs-12 visible-xs visible-sm" style="padding: 0px"> | |
74 | 74 | <div class="post-filter post-filter-small"> |
75 | 75 | <h4>{% trans 'Filter' %}</h4> |
76 | 76 | ... | ... |
mural/templates/mural/list_subject.html
... | ... | @@ -69,7 +69,7 @@ |
69 | 69 | <input type="hidden" class="log_id" value="" /> |
70 | 70 | |
71 | 71 | <div class="col-md-12 cards-content mural" data-url="{% url 'mural:load_subject' subject.id %}"> |
72 | - <div class="col-sm-12 col-xs-12 visible-xs visible-sm" style="padding-left: 0px"> | |
72 | + <div class="col-sm-12 col-xs-12 visible-xs visible-sm" style="padding: 0px"> | |
73 | 73 | <div class="post-filter post-filter-small"> |
74 | 74 | <h4>{% trans 'Filter' %}</h4> |
75 | 75 | ... | ... |
mural/templates/mural/resource_view.html
... | ... | @@ -32,8 +32,26 @@ |
32 | 32 | </div> |
33 | 33 | </div> |
34 | 34 | <div id="{{subject.slug}}" class="panel-collapse panel-body in collapse mural-ungeneral subject-related-panel"> |
35 | - <div class="col-md-12 cards-content mural" data-url="{% url 'mural:resource_view' resource.slug %}" data-pages="{{ paginator.num_pages }}" data-page="{{ page_obj.number }}" data-fav="{{ favorites }}" data-mine="{{ mines }}"> | |
36 | - <div class="col-md-9 col-sm-9 col-xs-9 mural-list"> | |
35 | + <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12 cards-content mural" data-url="{% url 'mural:resource_view' resource.slug %}" data-pages="{{ paginator.num_pages }}" data-page="{{ page_obj.number }}" data-fav="{{ favorites }}" data-mine="{{ mines }}"> | |
36 | + <div class="col-sm-12 col-xs-12 visible-xs visible-sm" style="padding-left: 0px"> | |
37 | + <div class="post-filter post-filter-small"> | |
38 | + <h4>{% trans 'Filter' %}</h4> | |
39 | + | |
40 | + <form id="post-filters" action="" method="GET"> | |
41 | + <div class="checkbox"> | |
42 | + <label> | |
43 | + <input name="favorite" type="checkbox" {{ favorites }}> {% trans 'Favorite posts' %} <i class="fa fa-thumb-tack"></i> | |
44 | + </label> | |
45 | + </div> | |
46 | + <div class="checkbox"> | |
47 | + <label> | |
48 | + <input name="mine" type="checkbox" {{ mines }}> {% trans 'Only my posts' %} | |
49 | + </label> | |
50 | + </div> | |
51 | + </form> | |
52 | + </div> | |
53 | + </div> | |
54 | + <div class="col-lg-9 col-md-9 col-sm-12 col-xs-12 mural-list"> | |
37 | 55 | <div class="post_make panel panel-default"> |
38 | 56 | <div class="panel-body"> |
39 | 57 | <div class="col-lg-1 col-md-1 col-sm-1 col-xs-1 user-img text-center"> |
... | ... | @@ -62,7 +80,7 @@ |
62 | 80 | <h4>{% trans 'There are no posts in this mural yet.' %}</h4> |
63 | 81 | </div> |
64 | 82 | </div> |
65 | - <div class="col-md-3 col-sm-3 col-xs-3 post-filter"> | |
83 | + <div class="col-lg-3 col-md-3 hidden-xs hidden-sm post-filter"> | |
66 | 84 | <h4>{% trans 'Filter' %}</h4> |
67 | 85 | |
68 | 86 | <form id="post-filters" action="" method="GET"> | ... | ... |
mural/templates/mural/subject_view.html
... | ... | @@ -48,7 +48,25 @@ |
48 | 48 | </div> |
49 | 49 | <div id="{{subject.slug}}" class="panel-collapse panel-body in collapse mural-ungeneral subject-related-panel"> |
50 | 50 | <div class="col-md-12 cards-content mural" data-url="{% url 'mural:subject_view' subject.slug %}" data-pages="{{ paginator.num_pages }}" data-page="{{ page_obj.number }}" data-fav="{{ favorites }}" data-mine="{{ mines }}"> |
51 | - <div class="col-md-9 col-sm-9 col-xs-9 mural-list"> | |
51 | + <div class="col-sm-12 col-xs-12 visible-xs visible-sm" style="padding-left: 0px"> | |
52 | + <div class="post-filter post-filter-small"> | |
53 | + <h4>{% trans 'Filter' %}</h4> | |
54 | + | |
55 | + <form id="post-filters" action="" method="GET"> | |
56 | + <div class="checkbox"> | |
57 | + <label> | |
58 | + <input name="favorite" type="checkbox" {{ favorites }}> {% trans 'Favorite posts' %} <i class="fa fa-thumb-tack"></i> | |
59 | + </label> | |
60 | + </div> | |
61 | + <div class="checkbox"> | |
62 | + <label> | |
63 | + <input name="mine" type="checkbox" {{ mines }}> {% trans 'Only my posts' %} | |
64 | + </label> | |
65 | + </div> | |
66 | + </form> | |
67 | + </div> | |
68 | + </div> | |
69 | + <div class="col-md-9 col-sm-12 col-xs-12 mural-list"> | |
52 | 70 | <div class="post_make panel panel-default"> |
53 | 71 | <div class="panel-body"> |
54 | 72 | <div class="col-lg-1 col-md-1 col-sm-1 col-xs-1 user-img text-center"> |
... | ... | @@ -77,7 +95,7 @@ |
77 | 95 | <h4>{% trans 'There are no posts in this mural yet.' %}</h4> |
78 | 96 | </div> |
79 | 97 | </div> |
80 | - <div class="col-md-3 col-sm-3 col-xs-3 post-filter"> | |
98 | + <div class="col-lg-3 col-md-3 hidden-xs hidden-sm post-filter"> | |
81 | 99 | <h4>{% trans 'Filter' %}</h4> |
82 | 100 | |
83 | 101 | <form id="post-filters" action="" method="GET"> | ... | ... |
notifications/templates/notifications/_view.html
... | ... | @@ -7,7 +7,7 @@ |
7 | 7 | <div class="col-md-12"> |
8 | 8 | <div class="panel panel-default"> |
9 | 9 | <div class="pendency panel-body"> |
10 | - <ul class="breadcrumb pend-card"> | |
10 | + <ul class="breadcrumb pend-card hidden-sm hidden-xs"> | |
11 | 11 | <li> |
12 | 12 | <a href="{% url 'subjects:home' %}">{% trans 'Home' %}</a> |
13 | 13 | </li> |
... | ... | @@ -48,7 +48,7 @@ |
48 | 48 | </div> |
49 | 49 | {% if not has_subject_permissions %} |
50 | 50 | <div class="row text-center"> |
51 | - <a href="{{ notification.task.resource.access_link }}" class="btn btn-success btn-raised" {% if notification.task.resource.show_window %}target="_blank"{% endif %}> | |
51 | + <a href="{{ notification.task.resource.access_link }}" class="btn btn-success btn-mobile btn-raised" {% if notification.task.resource.show_window %}target="_blank"{% endif %}> | |
52 | 52 | {% if notification.level == 4 %} |
53 | 53 | {% trans 'Access the task' %} |
54 | 54 | {% else %} |
... | ... | @@ -57,8 +57,8 @@ |
57 | 57 | </a> |
58 | 58 | |
59 | 59 | {% if notification.level < 3 %} |
60 | - <button class="btn btn-default no_button">{% trans 'or' %}</button> | |
61 | - <button class="btn btn-default btn-raised" data-toggle="popover" data-placement="right"> | |
60 | + <button class="btn btn-default no_button btn-mobile visible-xs-block visible-sm-block">{% trans 'or' %}</button> | |
61 | + <button class="btn btn-default btn-raised btn-mobile" data-toggle="popover" data-placement="right"> | |
62 | 62 | {% if notification.level == 1 %} |
63 | 63 | {% trans 'Define goal to realization' %} |
64 | 64 | {% else %} | ... | ... |
subjects/templates/subjects/subject_card.html
... | ... | @@ -58,7 +58,7 @@ |
58 | 58 | <input type="hidden" class="log_id" value="" /> |
59 | 59 | |
60 | 60 | <div class="row"> |
61 | - <div class="col-md-6"> | |
61 | + <div class="col-md-6 col-xs-12"> | |
62 | 62 | {% if subject.professor.all|length > 0 %} |
63 | 63 | <h4><b>{% trans "Professor(s) " %}: </b> |
64 | 64 | {{ subject.professor.all|join:', ' }} |
... | ... | @@ -67,11 +67,11 @@ |
67 | 67 | <h4> {% trans "It doesn't possess professors" %} </h4> |
68 | 68 | {% endif %} |
69 | 69 | </div> |
70 | - <div class="col-xs-6 col-md-3"> | |
71 | - <p><b>{% trans "Beginning" %}:</b> {{subject.init_date}}</p> | |
70 | + <div class="col-xs-6 col-md-3 subject-period"> | |
71 | + <p><b>{% trans "Beginning" %}:</b> {{ subject.init_date|date:"SHORT_DATE_FORMAT" }} </p> | |
72 | 72 | </div> |
73 | - <div class="col-xs-6 col-md-3"> | |
74 | - <p><b>{% trans "End" %}:</b> {{subject.end_date}}</p> | |
73 | + <div class="col-xs-6 col-md-3 subject-period"> | |
74 | + <p><b>{% trans "End" %}:</b> {{ subject.end_date|date:"SHORT_DATE_FORMAT" }}</p> | |
75 | 75 | </div> |
76 | 76 | |
77 | 77 | <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12"> | ... | ... |
subjects/templates/subjects/view.html
... | ... | @@ -99,18 +99,18 @@ |
99 | 99 | |
100 | 100 | <br clear="all" /> |
101 | 101 | |
102 | - <div class="col-md-3 col-sm-3 user-img"> | |
102 | + <div class="col-md-3 col-sm-3 col-xs-3 user-img"> | |
103 | 103 | <img src="{{ participant.image_url }}" class="img-responsive" /> |
104 | 104 | </div> |
105 | - <div class="col-md-9 col-sm-9 user-info"> | |
105 | + <div class="col-md-9 col-sm-9 col-xs-9 user-info"> | |
106 | 106 | <h4><a class="status {{ status }}" data-toggle="tooltip" title="{{ status|status_text }}"></a> {{ participant }}</h4> |
107 | 107 | </div> |
108 | 108 | </div> |
109 | 109 | <div class="popover-footer"> |
110 | - <a href="#" onclick="getModalInfo($(this), '{{ subject.id }}', 'subject'); return false;" data-url='{% url "chat:profile" participant.email %}' class="btn btn-default btn-sm btn-raised pull-left"> | |
110 | + <a href="#" onclick="getModalInfo($(this), '{{ subject.id }}', 'subject'); return false;" data-url='{% url "chat:profile" participant.email %}' class="btn btn-default btn-raised pull-left btn-popover-mobile"> | |
111 | 111 | {% trans 'See Profile' %} |
112 | 112 | </a> |
113 | - <a href="#" onclick="getModalInfo($(this), '{{ subject.id }}', 'subject'); return false;" data-url='{% url "chat:talk" participant.email %}' class="btn btn-success btn-sm btn-raised pull-right"> | |
113 | + <a href="#" onclick="getModalInfo($(this), '{{ subject.id }}', 'subject'); return false;" data-url='{% url "chat:talk" participant.email %}' class="btn btn-success btn-raised pull-right btn-popover-mobile"> | |
114 | 114 | {% trans 'Send Message' %} |
115 | 115 | </a> |
116 | 116 | </div> |
... | ... | @@ -148,6 +148,9 @@ |
148 | 148 | |
149 | 149 | $('[data-toggle="popover"]').popover({ |
150 | 150 | html: true, |
151 | + placement: function () { | |
152 | + return window.innerWidth <= 768 ? 'bottom' : 'left'; | |
153 | + }, | |
151 | 154 | content: function () { |
152 | 155 | return $(this).parent().find(".popover").html(); |
153 | 156 | } | ... | ... |
themes/templates/themes/css_update.html
... | ... | @@ -29,30 +29,28 @@ |
29 | 29 | <br clear="all" /> |
30 | 30 | |
31 | 31 | {% for radio in field %} |
32 | - {% if radio.choice_value == 'contrast' %} | |
33 | - | |
34 | - {% else %} | |
35 | - | |
36 | - <label for="{{ radio.id_for_label }}" class="row text-center"> | |
37 | - <div class="col-lg-offset-2 col-md-offset-2 col-sm-offset-2 col-lg-2 col-md-2 col-sm-2 col-xs-3 text-left"> | |
38 | - <span class="radio"> | |
39 | - {{ radio }} | |
40 | - </span> | |
41 | - </div> | |
42 | - <div class="col-lg-4 col-md-4 col-sm-4 col-xs-4"> | |
43 | - {% with 'img/themes/'|add:radio.choice_value|add:'.png' as img_presentation %} | |
44 | - <img class="radio theme_img" src="{% static img_presentation %}" /> | |
45 | - {% endwith %} | |
46 | - </div> | |
47 | - <div class="col-md-2 col-md-2 col-sm-2 col-xs-2"> | |
48 | - {% with 'css/themes/'|add:radio.choice_value|add:'.css' as doc_presentation %} | |
49 | - <a class="radio" href="{% static doc_presentation %}" target="blank">{% trans 'Documentation' %}</a> | |
50 | - {% endwith %} | |
51 | - </div> | |
52 | - </label> | |
53 | - <br clear="all" /> | |
54 | - {% endif %} | |
32 | + {% if radio.choice_value == 'contrast' %} | |
55 | 33 | |
34 | + {% else %} | |
35 | + <label for="{{ radio.id_for_label }}" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 text-center"> | |
36 | + <div class="col-lg-offset-2 col-md-offset-2 col-sm-offset-1 col-lg-2 col-md-2 col-sm-3 col-xs-12 text-left"> | |
37 | + <span class="radio"> | |
38 | + {{ radio }} | |
39 | + </span> | |
40 | + </div> | |
41 | + <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12"> | |
42 | + {% with 'img/themes/'|add:radio.choice_value|add:'.jpg' as img_presentation %} | |
43 | + <img class="radio theme_img" src="{% static img_presentation %}" /> | |
44 | + {% endwith %} | |
45 | + </div> | |
46 | + <div class="col-md-2 col-md-2 col-sm-2 col-xs-12"> | |
47 | + {% with 'docs/themes/'|add:radio.choice_value|add:'_docs.pdf' as doc_presentation %} | |
48 | + <a class="radio" href="{% static doc_presentation %}" target="blank">{% trans 'Documentation' %}</a> | |
49 | + {% endwith %} | |
50 | + </div> | |
51 | + </label> | |
52 | + <br clear="all" /> | |
53 | + {% endif %} | |
56 | 54 | {% endfor %} |
57 | 55 | </div> |
58 | 56 | ... | ... |