diff --git a/democracy/files/autoload.inc b/democracy/files/autoload.inc index 507eab0..e637f1c 100644 --- a/democracy/files/autoload.inc +++ b/democracy/files/autoload.inc @@ -6,4 +6,5 @@ \SYSTEM\FILES\files::registerFolder(dirname(__FILE__).'/wir/','wir','*.*'); \SYSTEM\FILES\files::registerFolder(dirname(__FILE__).'/medien/','medien','*.*'); \SYSTEM\FILES\files::registerFolder(dirname(__FILE__).'/landing/','landing','*.*'); +\SYSTEM\FILES\files::registerFolder(dirname(__FILE__).'/references/','references','*.*'); \SYSTEM\FILES\files::registerFolder(dirname(__FILE__).'/org/','org','*.*'); \ No newline at end of file diff --git a/democracy/files/org/1200px-Hertie-Stiftung.png b/democracy/files/org/1200px-Hertie-Stiftung.png new file mode 100644 index 0000000..e4ef2d5 Binary files /dev/null and b/democracy/files/org/1200px-Hertie-Stiftung.png differ diff --git a/democracy/files/org/IP_Logo_RGB.png b/democracy/files/org/IP_Logo_RGB.png new file mode 100644 index 0000000..611a308 Binary files /dev/null and b/democracy/files/org/IP_Logo_RGB.png differ diff --git a/democracy/files/org/Logo_KIT.png b/democracy/files/org/Logo_KIT.png new file mode 100644 index 0000000..911e0f3 Binary files /dev/null and b/democracy/files/org/Logo_KIT.png differ diff --git a/democracy/files/org/MDR-SPUTNIK.png b/democracy/files/org/MDR-SPUTNIK.png new file mode 100644 index 0000000..e42f6e5 Binary files /dev/null and b/democracy/files/org/MDR-SPUTNIK.png differ diff --git a/democracy/files/org/MDR-SPUTNIK_transp.png b/democracy/files/org/MDR-SPUTNIK_transp.png new file mode 100644 index 0000000..427e48d Binary files /dev/null and b/democracy/files/org/MDR-SPUTNIK_transp.png differ diff --git a/democracy/files/org/Prototype.png b/democracy/files/org/Prototype.png new file mode 100644 index 0000000..f7118db Binary files /dev/null and b/democracy/files/org/Prototype.png differ diff --git a/democracy/files/org/demokratie-io-landscape-claim-2.png b/democracy/files/org/demokratie-io-landscape-claim-2.png new file mode 100644 index 0000000..b047573 Binary files /dev/null and b/democracy/files/org/demokratie-io-landscape-claim-2.png differ diff --git a/democracy/files/org/startnext_logo_green-1.png b/democracy/files/org/startnext_logo_green-1.png new file mode 100644 index 0000000..fe08395 Binary files /dev/null and b/democracy/files/org/startnext_logo_green-1.png differ diff --git a/democracy/files/references/1200px-Hertie-Stiftung.png b/democracy/files/references/1200px-Hertie-Stiftung.png new file mode 100644 index 0000000..1832d3f Binary files /dev/null and b/democracy/files/references/1200px-Hertie-Stiftung.png differ diff --git a/democracy/files/references/IP_Logo_RGB.png b/democracy/files/references/IP_Logo_RGB.png new file mode 100644 index 0000000..9356c58 Binary files /dev/null and b/democracy/files/references/IP_Logo_RGB.png differ diff --git a/democracy/files/references/Logo_KIT.png b/democracy/files/references/Logo_KIT.png new file mode 100644 index 0000000..3a277a7 Binary files /dev/null and b/democracy/files/references/Logo_KIT.png differ diff --git a/democracy/files/references/MDR-SPUTNIK.png b/democracy/files/references/MDR-SPUTNIK.png new file mode 100644 index 0000000..38e29e0 Binary files /dev/null and b/democracy/files/references/MDR-SPUTNIK.png differ diff --git a/democracy/files/references/Prototype.png b/democracy/files/references/Prototype.png new file mode 100644 index 0000000..7fc871f Binary files /dev/null and b/democracy/files/references/Prototype.png differ diff --git a/democracy/files/references/demokratie-io-landscape-claim-2.png b/democracy/files/references/demokratie-io-landscape-claim-2.png new file mode 100644 index 0000000..db213dd Binary files /dev/null and b/democracy/files/references/demokratie-io-landscape-claim-2.png differ diff --git a/democracy/files/references/startnext_logo_green-1.png b/democracy/files/references/startnext_logo_green-1.png new file mode 100644 index 0000000..70de70c Binary files /dev/null and b/democracy/files/references/startnext_logo_green-1.png differ diff --git a/democracy/page/default_page/css/default_page.css b/democracy/page/default_page/css/default_page.css index e95ecb4..550aa94 100644 --- a/democracy/page/default_page/css/default_page.css +++ b/democracy/page/default_page/css/default_page.css @@ -340,14 +340,20 @@ body { #insta__:hover{ color:#BA3173; } +#github_:hover{ + color:#3b5998; +} +#discord_:hover{ + color:#3b5998; +} -#contact_mail a { +.contact_mail a { font-size:.9em; text-decoration:none; color:#fff; } -#contact_mail a:hover { +.contact_mail a:hover { color:#F44336; } @@ -365,4 +371,14 @@ body { .welcome-right li{ padding-top: 5px; margin-left: 20px; +} + +.tooltip-inner{ + width: 250px; + max-width: 250px; + font-size: large; + height: 70px; + max-height: 70px; + vertical-align: middle; + display: table-cell; } \ No newline at end of file diff --git a/democracy/page/default_page/tpl/default_page.tpl b/democracy/page/default_page/tpl/default_page.tpl index 34bbaa4..81ba904 100644 --- a/democracy/page/default_page/tpl/default_page.tpl +++ b/democracy/page/default_page/tpl/default_page.tpl @@ -76,43 +76,49 @@
+
+ +
+

DEMOCRACY

+
Demokratie_live
+ +

+

+

+

Stell dir vor...

+

+
+
+
- - - - -
-

DEMOCRACY

-
Demokratie_live
-

- ${main_startnext_status} -

- - ${main_startnext_support}
- Startnext Logo - -
- - -
@@ -138,17 +144,17 @@
-

Kontakt Info

-

DEMOCRACY
Deutschland e.V.

- (gemeinnützig) -
-
-
Industriestr. 10
-
37079 Göttingen
-
Deutschland
- -
Fon: +49 176 470 40 213
-
+

Kontakt Info

+

DEMOCRACY
Deutschland e.V.

+ (gemeinnützig) +
+
+
Industriestr. 10
+
37079 Göttingen
+
Deutschland
+
EMail schreiben
+
Fon: +49 176 470 40 213
+

Navigation

@@ -165,14 +171,14 @@

Spenden

- +
Bank: Triodos Bank
-
IBAN:
-
BIC:
- --> +
IBAN: DE33 5003 1000 1049 7560 00
+
BIC: TRODDEF1
+
+
Spendenquittung auf Anfrage
diff --git a/democracy/page/default_prototyp/tpl/default_prototyp.tpl b/democracy/page/default_prototyp/tpl/default_prototyp.tpl index c291a60..c59eee5 100644 --- a/democracy/page/default_prototyp/tpl/default_prototyp.tpl +++ b/democracy/page/default_prototyp/tpl/default_prototyp.tpl @@ -4,7 +4,7 @@
-
+ \ No newline at end of file diff --git a/democracy/page/default_start/js/default_start.js b/democracy/page/default_start/js/default_start.js index 747eded..bf13525 100644 --- a/democracy/page/default_start/js/default_start.js +++ b/democracy/page/default_start/js/default_start.js @@ -9,4 +9,6 @@ function init_start(){ $(".m_mm").removeClass("active"); $("#m_idee").addClass("active"); $(".footer").addClass("footer_bg_grey"); + + $('[data-toggle="tooltip"]').tooltip(); } \ No newline at end of file diff --git a/democracy/page/default_start/tpl/default_start.tpl b/democracy/page/default_start/tpl/default_start.tpl index f87042a..a76c17f 100644 --- a/democracy/page/default_start/tpl/default_start.tpl +++ b/democracy/page/default_start/tpl/default_start.tpl @@ -1,36 +1,81 @@
-

Stell dir vor...

-

-
DEMOCRACY App Story
-
+

+

-
-
-

Vision

-

-
-
-
-
- ${main_text_left} +
+
+
+

Vision

+

+
+
+
+
${main_text_left}
+
+
+

Unsere Funktionen

+ ${main_functions} +
+
+
+
+
+
+
+

+

+

Partner & Referenzen

+

+
+
+
+ + Startnext Logo + +
+
+ + Herti Stiftung Logo + +
+
+ + Idealism Prevails Logo + +
+
+ + MDR Sputnik Logo + +
+
+
+
+
+ + KIT Logo + +
+
+ + Demokratie IO Logo + +
+
+ + Prototype Fund Logo + +
-
-

Unsere Funktionen

- ${main_functions} -
-
-

-
-
\ No newline at end of file