From 37e83fe47fa09b746273f9be3e7c61752e0c9870 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Sun, 18 Nov 2018 22:23:23 +0100 Subject: [PATCH] updated sai mod refs, new bootstrap v4.1 api --- .../account_account/tpl/account_account.tpl | 10 ++- .../tpl/account_changepassword.tpl | 10 ++- .../page/default_faq/tpl/default_faq.tpl | 10 ++- .../tpl/default_impressum.tpl | 10 ++- .../default_kandidat/tpl/default_kandidat.tpl | 10 ++- .../default_komitee/tpl/default_komitee.tpl | 20 +++--- .../default_kontakt/tpl/default_kontakt.tpl | 10 ++- .../page/default_login/tpl/default_login.tpl | 10 ++- .../page/default_page/css/default_page.css | 25 +++++++ .../page/default_page/js/default_page.js | 6 +- .../page/default_page/tpl/default_page.tpl | 68 +++++++++---------- .../tpl/default_resetpassword.tpl | 10 ++- .../page/default_start/tpl/default_start.tpl | 68 +++++++++---------- .../tpl/default_unterstuetzen.tpl | 10 ++- buergerkomitee/sai/saimod_webcraft_contact | 2 +- buergerkomitee/sai/saimod_webcraft_updates | 2 +- 16 files changed, 138 insertions(+), 143 deletions(-) diff --git a/buergerkomitee/page/account_account/tpl/account_account.tpl b/buergerkomitee/page/account_account/tpl/account_account.tpl index 0c95328..2202e4e 100644 --- a/buergerkomitee/page/account_account/tpl/account_account.tpl +++ b/buergerkomitee/page/account_account/tpl/account_account.tpl @@ -1,10 +1,8 @@ -
-
-

-   Account -

+
+
+   Account
-
+
Username: ${username}
EMail: ${email} diff --git a/buergerkomitee/page/account_changepassword/tpl/account_changepassword.tpl b/buergerkomitee/page/account_changepassword/tpl/account_changepassword.tpl index 653eaf8..0db06c5 100644 --- a/buergerkomitee/page/account_changepassword/tpl/account_changepassword.tpl +++ b/buergerkomitee/page/account_changepassword/tpl/account_changepassword.tpl @@ -1,12 +1,10 @@
-
-
-

-   Passwort ändern -

+
+
+   Passwort ändern
-
+
-
-

-   FAQ -

+
+
+   FAQ
-
+
${content_faq}
\ No newline at end of file diff --git a/buergerkomitee/page/default_impressum/tpl/default_impressum.tpl b/buergerkomitee/page/default_impressum/tpl/default_impressum.tpl index b8b3fec..8f6897e 100644 --- a/buergerkomitee/page/default_impressum/tpl/default_impressum.tpl +++ b/buergerkomitee/page/default_impressum/tpl/default_impressum.tpl @@ -1,10 +1,8 @@ -
-
-

-   Impressum -

+
+
+   Impressum
-
+
${content_impressum}
\ No newline at end of file diff --git a/buergerkomitee/page/default_kandidat/tpl/default_kandidat.tpl b/buergerkomitee/page/default_kandidat/tpl/default_kandidat.tpl index 1134c0b..67a53b3 100644 --- a/buergerkomitee/page/default_kandidat/tpl/default_kandidat.tpl +++ b/buergerkomitee/page/default_kandidat/tpl/default_kandidat.tpl @@ -1,10 +1,8 @@ -
-
-

-   Kandidat -

+
+
+   Kandidat
-
+
${content_kandidat}
diff --git a/buergerkomitee/page/default_komitee/tpl/default_komitee.tpl b/buergerkomitee/page/default_komitee/tpl/default_komitee.tpl index 0cd0cb0..1eaaf46 100644 --- a/buergerkomitee/page/default_komitee/tpl/default_komitee.tpl +++ b/buergerkomitee/page/default_komitee/tpl/default_komitee.tpl @@ -1,20 +1,16 @@ -
-
-

-   Komitee -

+
+
+   Komitee
-
+
${content_komitee}
-
-
-

-   Protokolle -

+
+
+   Protokolle
-
+
${content_protocol}

diff --git a/buergerkomitee/page/default_kontakt/tpl/default_kontakt.tpl b/buergerkomitee/page/default_kontakt/tpl/default_kontakt.tpl index 1c0ccd3..6619cc2 100644 --- a/buergerkomitee/page/default_kontakt/tpl/default_kontakt.tpl +++ b/buergerkomitee/page/default_kontakt/tpl/default_kontakt.tpl @@ -1,10 +1,8 @@ -
-
-

-   Kontakt -

+
+
+   Kontakt
-
+
diff --git a/buergerkomitee/page/default_login/tpl/default_login.tpl b/buergerkomitee/page/default_login/tpl/default_login.tpl index 87f9b7c..5b78e1b 100644 --- a/buergerkomitee/page/default_login/tpl/default_login.tpl +++ b/buergerkomitee/page/default_login/tpl/default_login.tpl @@ -1,10 +1,8 @@ -
-
-

-   Login -

+
+
+   Login
-
+
diff --git a/buergerkomitee/page/default_page/css/default_page.css b/buergerkomitee/page/default_page/css/default_page.css index ec99376..70da6aa 100644 --- a/buergerkomitee/page/default_page/css/default_page.css +++ b/buergerkomitee/page/default_page/css/default_page.css @@ -12,4 +12,29 @@ .active, .active a{ background-color: #e7e7e7 !important; +} + +.nav-link { + color: #000; +} + +.nav-link:hover{ + color: #000; +} + +.navbar-brand { + color: #000; + padding: 7px; + padding-left: 15px; +} + +.navbar-brand:hover{ + color: #000; +} + +.nav-item { + padding: 7px; +} +#footer { + margin-top: 15px; } \ No newline at end of file diff --git a/buergerkomitee/page/default_page/js/default_page.js b/buergerkomitee/page/default_page/js/default_page.js index fd2a025..32068f7 100644 --- a/buergerkomitee/page/default_page/js/default_page.js +++ b/buergerkomitee/page/default_page/js/default_page.js @@ -8,12 +8,12 @@ $(document).ready(function() { function sys_hashchange(state){ var state_ = state ? state.split(';')[0].split('(')[0] : state; var state_ = state_ ? state_.split('#')[0] : state; - $('.nav li').each(function(){ + $('.nav-item').each(function(){ $(this).removeClass('active');}); - $('.navbar-header').removeClass('active'); + $('.navbar-brand').removeClass('active'); if($('#menu_'+state_).parent().length){ $('#menu_'+state_).parent().addClass('active'); } else { - $('.navbar-header').addClass('active');} + $('.navbar-brand').addClass('active');} window.scrollTo(0,0); } \ No newline at end of file diff --git a/buergerkomitee/page/default_page/tpl/default_page.tpl b/buergerkomitee/page/default_page/tpl/default_page.tpl index b6b4f08..a7a7d6b 100644 --- a/buergerkomitee/page/default_page/tpl/default_page.tpl +++ b/buergerkomitee/page/default_page/tpl/default_page.tpl @@ -34,6 +34,9 @@ #keywords_link:link { text-decoration: none !important; } + .nav-item:active { + background-color: none !important; + } @@ -51,47 +54,42 @@
-
-
-
-

-   Aktuelles -

-
-
- ${content_aktuelles} +
+
+   Aktuelles +
+
+
+ ${content_aktuelles} +
-
-
-

-   Organisationen im Komitee -

-
-
+
+
+   Organisationen im Komitee +
+
${content_organisationen}
@@ -103,7 +101,7 @@
-
+ diff --git a/buergerkomitee/page/default_resetpassword/tpl/default_resetpassword.tpl b/buergerkomitee/page/default_resetpassword/tpl/default_resetpassword.tpl index 733232c..aafd60d 100644 --- a/buergerkomitee/page/default_resetpassword/tpl/default_resetpassword.tpl +++ b/buergerkomitee/page/default_resetpassword/tpl/default_resetpassword.tpl @@ -1,12 +1,10 @@
-
-
-

-   Passwort zurücksetzen -

+
+
+   Passwort zurücksetzen
-
+
-
-

-   Startseite -

-
-
-
-
${content_start}
+
+
+
+
+   Startseite +
+
+
+
${content_start}
+
+
-
+
-
-
-

-   Kandidat -

+
+
+   Kandidat
-
+
Sebastian Bucher
@@ -27,42 +27,36 @@
-
-
-

-   Komitee -

+
+
+   Komitee
-
+
${info_komitee}
-
+
-
-
-

-   FAQ -

+
+
+   FAQ
-
- +
+ ${info_faq}
-
-
-

-   Kontakt -

+
+
+   Kontakt
-
- +
+ ${info_kontakt}
diff --git a/buergerkomitee/page/default_unterstuetzen/tpl/default_unterstuetzen.tpl b/buergerkomitee/page/default_unterstuetzen/tpl/default_unterstuetzen.tpl index 4fa2c7c..5d0b074 100644 --- a/buergerkomitee/page/default_unterstuetzen/tpl/default_unterstuetzen.tpl +++ b/buergerkomitee/page/default_unterstuetzen/tpl/default_unterstuetzen.tpl @@ -1,10 +1,8 @@ -
-
-

-   Unterstützen -

+
+
+   Unterstützen
-
+
${content_unterstuetzen}
\ No newline at end of file diff --git a/buergerkomitee/sai/saimod_webcraft_contact b/buergerkomitee/sai/saimod_webcraft_contact index 2935cd6..5a17f89 160000 --- a/buergerkomitee/sai/saimod_webcraft_contact +++ b/buergerkomitee/sai/saimod_webcraft_contact @@ -1 +1 @@ -Subproject commit 2935cd6494b37ccf51362ccfd5c90e87f339e0f8 +Subproject commit 5a17f893dd809d5152f3dc6b91cb351dfcaa03fa diff --git a/buergerkomitee/sai/saimod_webcraft_updates b/buergerkomitee/sai/saimod_webcraft_updates index 293551a..4a2ad55 160000 --- a/buergerkomitee/sai/saimod_webcraft_updates +++ b/buergerkomitee/sai/saimod_webcraft_updates @@ -1 +1 @@ -Subproject commit 293551a530a734aba68cc77615d39eca67d54d75 +Subproject commit 4a2ad5598c2c1fe55600002cd9474442d7464d38