Overview
| Comment: | Adjusted columns for large and medium screens for remaining pages. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | view |
| Files: | files | file ages | folders |
| SHA3-256: |
c7f573cf0937c38d8c31773e10241f68 |
| User & Date: | florian 2024-03-27 10:26:50 |
Context
|
2024-04-04
| ||
| 17:58 | Merged changes from database. check-in: b05fa84ad4 user: florian tags: view | |
| 17:55 | Merged changes from view. check-in: 17f8bc3911 user: florian tags: database | |
|
2024-03-27
| ||
| 10:26 | Merged changes from view. check-in: f3630445fa user: florian tags: beta | |
| 10:26 | Adjusted columns for large and medium screens for remaining pages. check-in: c7f573cf09 user: florian tags: view | |
| 10:08 | Column widths and general margins now correctly adapt to large and medium screens. check-in: 268df0ae7e user: florian tags: view | |
Changes
Changes to luna_lms/webapp.py.
| ︙ | ︙ | |||
1202 1203 1204 1205 1206 1207 1208 | return_str += self._format_header(heading) return_str += '<div class="w3-row-padding general_left_right_margin" style="margin-top:0rem;margin-bottom:0rem;"><div class="w3-col luna-l12 luna-m12 spacer" style="height:2.5rem;"></div></div>' return_str += '<main class="w3-row-padding">' | | | | > > | 1202 1203 1204 1205 1206 1207 1208 1209 1210 1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226 | return_str += self._format_header(heading) return_str += '<div class="w3-row-padding general_left_right_margin" style="margin-top:0rem;margin-bottom:0rem;"><div class="w3-col luna-l12 luna-m12 spacer" style="height:2.5rem;"></div></div>' return_str += '<main class="w3-row-padding">' return_str += '<div class="w3-col luna-l3 luna-m3 spacer"></div>' return_str += '<div class="w3-col luna-l6 luna-m6 half-col-pad-left">' return_str += content return_str += '</div>' return_str += '<div class="w3-col luna-l2 luna-m2 spacer"></div>' return_str += '<div class="w3-col luna-l1 luna-m1 spacer"></div>' return_str += '</main>' return_str += HTML_FOOT return return_str |
| ︙ | ︙ | |||
1299 1300 1301 1302 1303 1304 1305 |
heading = line.split('>')[1].split('</')[0]
else:
welcome += line
return_str += self._format_header(heading)
| | | | | > > | 1301 1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312 1313 1314 1315 1316 1317 1318 1319 1320 1321 1322 1323 1324 1325 1326 1327 1328 1329 1330 1331 1332 1333 1334 1335 1336 1337 |
heading = line.split('>')[1].split('</')[0]
else:
welcome += line
return_str += self._format_header(heading)
return_str += '<div class="w3-row-padding general_left_right_margin" style="margin-top:0rem;margin-bottom:0rem;"><div class="w3-col luna-l12 luna-m12 spacer" style="height:2.5rem;"></div></div>'
return_str += '<main class="w3-row-padding">'
return_str += '<div class="w3-col luna-l3 luna-m3 spacer"></div>'
return_str += '<div class="w3-col luna-l6 luna-m6 half-col-pad-left">'
return_str += welcome
return_str += '<a class="button" href="/courses"><div class="image_spacer"><img src="/static/course_start.svg" alt=""></div>{}</a>'.format(_("Kurs beginnen"))
return_str += '<a class="button" href="/continue"><div class="image_spacer"><img src="/static/course_continue.svg" alt=""></div>{}</a>'.format(_("Kurs fortsetzen"))
return_str += '<br>'
return_str += '<a class="button_inactive"><div class="image_spacer"><img src="/static/account_add.svg" alt=""></div>{}</a>'.format(_("Konto anlegen"))
return_str += '</div>'
return_str += '<div class="w3-col luna-l2 luna-m2 spacer"></div>'
return_str += '<div class="w3-col luna-l1 luna-m1 spacer"></div>'
return_str += '</main>'
return_str += HTML_FOOT
return return_str
|
| ︙ | ︙ | |||
1371 1372 1373 1374 1375 1376 1377 |
LOGGER.error("Path '{}' is not cached in course {}, and does not point to a valid resource".format(course_id, path))
raise cherrypy.NotFound()
return_str = HTML_HEAD.format(title = _("Luna LMS: Kurs-Übersicht"))
return_str += self._format_header(_("Kurs-Übersicht"))
| | | | | 1375 1376 1377 1378 1379 1380 1381 1382 1383 1384 1385 1386 1387 1388 1389 1390 1391 1392 1393 1394 1395 |
LOGGER.error("Path '{}' is not cached in course {}, and does not point to a valid resource".format(course_id, path))
raise cherrypy.NotFound()
return_str = HTML_HEAD.format(title = _("Luna LMS: Kurs-Übersicht"))
return_str += self._format_header(_("Kurs-Übersicht"))
return_str += '<div class="w3-row-padding general_left_right_margin" style="margin-top:0rem;margin-bottom:0rem;"><div class="w3-col luna-l12 luna-m12 spacer" style="height:2.5rem;"></div></div>'
return_str += '<main class="w3-row-padding">'
return_str += '<div class="w3-col luna-l3 luna-m3 spacer"></div>'
return_str += '<div class="w3-col luna-l6 luna-m6 half-col-pad-left">'
return_str += '<form class="search inactive">'
desc = _("Suche nach Kurs-Titeln, Schlagworten und mehr...")
return_str += '<input name="terms" type="text" value="{0}" title="{0}" disabled>'.format(desc)
return_str += '<button type="submit" disabled><img src="/static/search-inactive.svg" alt="{}"></button>'.format(_("Suchen"))
return_str += '</form>'
|
| ︙ | ︙ | |||
1451 1452 1453 1454 1455 1456 1457 |
return_str += '</div>'
return_str += '<a href="/" class="browse"><div class="image_spacer"><img src="/static/back.svg" alt=""></div>{}</a>'.format(_("Zurück zur Start-Seite"))
return_str += '</div>'
| | > > | 1455 1456 1457 1458 1459 1460 1461 1462 1463 1464 1465 1466 1467 1468 1469 1470 1471 |
return_str += '</div>'
return_str += '<a href="/" class="browse"><div class="image_spacer"><img src="/static/back.svg" alt=""></div>{}</a>'.format(_("Zurück zur Start-Seite"))
return_str += '</div>'
return_str += '<div class="w3-col luna-l2 luna-m2 spacer"></div>'
return_str += '<div class="w3-col luna-l1 luna-m1 spacer"></div>'
return_str += '</main>'
return_str += HTML_FOOT
return return_str
|
| ︙ | ︙ |