PYROS-IRAP / pyros

Commit 8ac397900eb814ac46d13a840212d84ddf4ea63a

Authored by Alexis Koralewski
1 parent 05316241
Exists in dev

Fixing alignment of elements for observation and monitoring index views

Showing 2 changed files with 43 additions and 54 deletions   Show diff stats
Inline Side-by-side
src/core/pyros_django/dashboard/templates/dashboard/observation_index.html
  Diff comments   View file @8ac3979
... ... @@ -24,7 +24,7 @@
24 24 text-align: center;
25 25 margin-left: auto;
26 26 margin-right: auto;
27   - column-gap: 3%;
  27 + //column-gap: 3%;
28 28 }
29 29  
30 30 .all-grid:after {
... ... @@ -39,6 +39,7 @@
39 39 .all-grid li {
40 40 width: 220px;
41 41 height: 180px;
  42 + margin-bottom: 3%;
42 43 display: inline-block;
43 44 }
44 45  
... ... @@ -83,70 +84,64 @@
83 84 <div class="all-grid d-flex flex-column">
84 85 {% if USER_LEVEL|ifinlist:"Admin,Observer,Unit-PI,Management board member,TAC" %}
85 86 <li>
86   - <div class="all-box all-img-proposal">
87   - {% comment %}
88   - Old version to be remastered :
89   - <a href="{% url "proposal" %}">
90   - <div class="all-info">
91   -
92   - <h3>Proposal</h3>
93   - {% load static %} <img src="{% static "media/proposal.png" %}" alt="html5" height="180" width="180" />
94   - </div></a>
95   - {% endcomment %}
  87 + {% comment %}
  88 + Old version to be remastered :
  89 + <a href="{% url "proposal" %}">
  90 + <div class="all-info">
  91 +
  92 + <h3>Proposal</h3>
  93 + {% load static %} <img src="{% static "media/proposal.png" %}" alt="html5" height="180" width="180" />
  94 + </div></a>
  95 + {% endcomment %}
  96 + <div class="all-info">
96 97 <a href="{% url "index_scientific_program" %}">
97   - <div class="all-info">
98 98  
99 99 <h3>Scientific programs</h3>
100 100 {% load static %} <img src="{% static "media/proposal.png" %}" alt="html5" />
101   - </div></a>
  101 + </a>
102 102 </div>
103 103 </li>
104 104 {% endif %}
105 105 {# TBD #}
106 106 {% if USER_LEVEL|ifinlist:"Admin,Operator,Unit-PI,Management board member,Observer,TAC" %}
107 107 <li>
108   - <div class="all-box all-img-request">
  108 + <div class="all-info">
109 109 <a href="{% url "sequences_list" %}">
110   - <div class="all-info">
111   - <h3>Sequence</h3>
  110 + <h3>Sequences</h3>
112 111 {% load static %} <img src="{% static "media/request.png" %}" alt="html5" />
113   - </div></a>
  112 + </a>
114 113 </div>
115 114 </li>
116 115 {% endif %}
117 116 <li>
118   - <div class="all-box all-img-alert">
  117 + <div class="all-info">
119 118 <a href="{% url "alerts_list" %}">
120   - <div class="all-info">
121 119 <h3>Alerts</h3>
122 120 <img src="{% static "media/alert.png" %}" alt="html5" />
123   - </div></a>
  121 + </a>
124 122 </div>
125 123 </li>
126 124 <li>
127   - <div class="all-box all-img-schedule">
  125 + <div class="all-info">
128 126 <a href="{% url "current_schedule" %}">
129   - <div class="all-info">
130 127 <h3>Schedule</h3>
131 128 <img src="{% static "media/schedule.png" %}" alt="html5" />
132   - </div></a>
  129 + </a>
133 130 </div>
134 131 </li>
135 132 {# TBD #}
136 133 {% if USER_LEVEL|ifinlist:"Admin,Operator,Unit-PI,Management board member,Observer,TAC" %}
137 134 <li>
138   - <div class="all-box all-img-image">
  135 + <div class="all-info">
139 136 <a href="#">
140   - <div class="all-info">
141 137 <h3>Images</h3>
142 138 <img src="{% static "media/image.png" %}" alt="html5" />
143   - </div></a>
  139 + </a>
144 140 </div>
145 141 </li>
146 142 {% endif %}
147 143 {% if CAN_VIEW_SCIENCE_THEMES %}
148 144 <li>
149   - <div class="all-box all-img-proposal">
150 145 {% comment %}
151 146 Old version to be remastered :
152 147 <a href="{% url "proposal" %}">
... ... @@ -156,13 +151,13 @@
156 151 {% load static %} <img src="{% static "media/proposal.png" %}" alt="html5" height="180" width="180" />
157 152 </div></a>
158 153 {% endcomment %}
159   - <a href="{% url "science_theme_list" %}">
160   - <div class="all-info">
161   -
162   - <h3>Science themes</h3>
163   - {% load static %} <img src="{% static "media/proposal.png" %}" alt="html5" />
164   - </div></a>
165   - </div>
  154 + <div class="all-info">
  155 + <a href="{% url "science_theme_list" %}">
  156 +
  157 + <h3>Science themes</h3>
  158 + {% load static %} <img src="{% static "media/proposal.png" %}" alt="html5" />
  159 + </a>
  160 + </div>
166 161 </li>
167 162 {% endif %}
168 163 </div>
... ...
src/core/pyros_django/monitoring/templates/monitoring/monitoring_index.html
  Diff comments   View file @8ac3979
... ... @@ -38,8 +38,8 @@
38 38 .all-grid li {
39 39 width: 220px;
40 40 height: 180px;
  41 + margin-bottom: 3%;
41 42 display: inline-block;
42   - margin: 40px;
43 43 }
44 44  
45 45  
... ... @@ -82,64 +82,58 @@
82 82 <h1> Monitoring</h1>
83 83 <div class="all-grid d-flex flex-column">
84 84 <li>
85   - <div class="all-box all-img-weather">
  85 + <div class="all-info">
86 86 <a href="{% url "weather" %}">
87   - <div class="all-info">
88 87 <h3>Weather</h3>
89 88 <img id="weather_big_img" src="{% static "media/weather.png" %}" alt="html5" />
90   - </div></a>
  89 + </a>
91 90 </div>
92 91 </li>
93 92 <li>
94   - <div class="all-box all-img-weather">
  93 + <div class="all-info">
95 94 <a href="{% url "weather_history" %}">
96   - <div class="all-info">
97 95 <h3>Weather history</h3>
98 96 <img id="weather_big_img" src="{% static "media/weather.png" %}" alt="html5" />
99   - </div></a>
  97 + </a>
100 98 </div>
101 99 </li>
102 100 {# TBD #}
103 101 {% if USER_LEVEL|ifinlist:"Admin,Operator,Unit-PI,Management board member,Observer,TAC" %}
104 102 <li>
105   - <div class="all-box all-img-observatory">
  103 + <div class="all-info">
106 104 <a href="{% url "states" %}">
107   - <div class="all-info">
108 105 <h3>Observatory</h3>
109 106 <img id="observatory_img" src="{% static "media/observatory.png" %}" alt="html5" />
110   - </div></a>
  107 + </a>
111 108 </div>
112 109 </li>
113 110 {% else %}
114 111 <li>
115   - <div class="all-box all-img-observatory">
116   - <a href="{% url "site" %}">
117   - <div class="all-info">
  112 + <div class="all-info">
  113 + <a href="{% url "site" %}">
118 114 <h3>Observatory</h3>
119 115 <img id="observatory_img" src="{% static "media/observatory.png" %}" alt="html5" />
120   - </div></a>
  116 + </a>
121 117 </div>
122 118 </li>
123 119 {% endif %}
124 120 {# TBD #}
125 121 {% if USER_LEVEL|ifinlist:"Admin,Operator,Unit-PI,Management board member,Observer,TAC" %}
126 122 <li>
127   - <div class="all-box all-img-telescope">
  123 + <div class="all-info">
128 124 <a href="{% url "observation_status" %}">
129   - <div class="all-info">
130 125 <h3>Tele & Inst</h3>
131 126 <img src="{% static "media/telescope.png" %}" alt="html5" />
132   - </div></a>
  127 + </a>
133 128 </div>
134 129 </li>
135 130 {% endif %}
136 131 <li>
137   - <div class="all-box all-img-camera">
  132 + <div class="all-info">
138 133 <a href="#">
139   - <div class="all-info">
140 134 <h3>Webcams</h3>
141 135 <img src="{% static "media/camera.png" %}" alt="html5" />
142   - </div></a>
  136 + </a>
143 137 </div>
144 138 </li>
145 139 </div>
... ...