Download as
Browse Code »

Commit b3e262f7dbd881abe599e2384f9b73aa59b22f22

Authored by Zambom
1 parent f524bafd
Exists in master and in 2 other branches amadeus_univasf, refactoring

Adjusting mural display in mobile

Showing 6 changed files with 48 additions and 8 deletions   Show diff stats
amadeus/static/css/base/amadeus_responsive.css
  Diff comments   View file @b3e262f
@@ -106,6 +106,10 @@ @@ -106,6 +106,10 @@
106 font-size: 12px; 106 font-size: 12px;
107 } 107 }
108 108
  109 + .mural .mural-list {
  110 + padding: 0px;
  111 + }
  112 +
109 .navbar .project_name{ 113 .navbar .project_name{
110 display: block !important; 114 display: block !important;
111 } 115 }
mural/templates/mural/list.html
  Diff comments   View file @b3e262f
@@ -21,7 +21,7 @@ @@ -21,7 +21,7 @@
21 </div> 21 </div>
22 22
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 }}"> 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 <div class="post-filter post-filter-small"> 25 <div class="post-filter post-filter-small">
26 <h4>{% trans 'Filter' %}</h4> 26 <h4>{% trans 'Filter' %}</h4>
27 27
mural/templates/mural/list_category.html
  Diff comments   View file @b3e262f
@@ -70,7 +70,7 @@ @@ -70,7 +70,7 @@
70 <input type="hidden" class="log_id" value="" /> 70 <input type="hidden" class="log_id" value="" />
71 71
72 <div class="col-md-12 cards-content mural" data-url="{% url 'mural:load_category' category.id %}"> 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 <div class="post-filter post-filter-small"> 74 <div class="post-filter post-filter-small">
75 <h4>{% trans 'Filter' %}</h4> 75 <h4>{% trans 'Filter' %}</h4>
76 76
mural/templates/mural/list_subject.html
  Diff comments   View file @b3e262f
@@ -69,7 +69,7 @@ @@ -69,7 +69,7 @@
69 <input type="hidden" class="log_id" value="" /> 69 <input type="hidden" class="log_id" value="" />
70 70
71 <div class="col-md-12 cards-content mural" data-url="{% url 'mural:load_subject' subject.id %}"> 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 <div class="post-filter post-filter-small"> 73 <div class="post-filter post-filter-small">
74 <h4>{% trans 'Filter' %}</h4> 74 <h4>{% trans 'Filter' %}</h4>
75 75
mural/templates/mural/resource_view.html
  Diff comments   View file @b3e262f
@@ -32,8 +32,26 @@ @@ -32,8 +32,26 @@
32 </div> 32 </div>
33 </div> 33 </div>
34 <div id="{{subject.slug}}" class="panel-collapse panel-body in collapse mural-ungeneral subject-related-panel"> 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 <div class="post_make panel panel-default"> 55 <div class="post_make panel panel-default">
38 <div class="panel-body"> 56 <div class="panel-body">
39 <div class="col-lg-1 col-md-1 col-sm-1 col-xs-1 user-img text-center"> 57 <div class="col-lg-1 col-md-1 col-sm-1 col-xs-1 user-img text-center">
@@ -62,7 +80,7 @@ @@ -62,7 +80,7 @@
62 <h4>{% trans 'There are no posts in this mural yet.' %}</h4> 80 <h4>{% trans 'There are no posts in this mural yet.' %}</h4>
63 </div> 81 </div>
64 </div> 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 <h4>{% trans 'Filter' %}</h4> 84 <h4>{% trans 'Filter' %}</h4>
67 85
68 <form id="post-filters" action="" method="GET"> 86 <form id="post-filters" action="" method="GET">
mural/templates/mural/subject_view.html
  Diff comments   View file @b3e262f
@@ -48,7 +48,25 @@ @@ -48,7 +48,25 @@
48 </div> 48 </div>
49 <div id="{{subject.slug}}" class="panel-collapse panel-body in collapse mural-ungeneral subject-related-panel"> 49 <div id="{{subject.slug}}" class="panel-collapse panel-body in collapse mural-ungeneral subject-related-panel">
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 }}"> 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 <div class="post_make panel panel-default"> 70 <div class="post_make panel panel-default">
53 <div class="panel-body"> 71 <div class="panel-body">
54 <div class="col-lg-1 col-md-1 col-sm-1 col-xs-1 user-img text-center"> 72 <div class="col-lg-1 col-md-1 col-sm-1 col-xs-1 user-img text-center">
@@ -77,7 +95,7 @@ @@ -77,7 +95,7 @@
77 <h4>{% trans 'There are no posts in this mural yet.' %}</h4> 95 <h4>{% trans 'There are no posts in this mural yet.' %}</h4>
78 </div> 96 </div>
79 </div> 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 <h4>{% trans 'Filter' %}</h4> 99 <h4>{% trans 'Filter' %}</h4>
82 100
83 <form id="post-filters" action="" method="GET"> 101 <form id="post-filters" action="" method="GET">