From 0a9e017d34c83b0d4db91a9aeefbc8b8c2e99117 Mon Sep 17 00:00:00 2001 From: Fabrixxm Date: Fri, 13 Nov 2015 10:56:06 +0100 Subject: [PATCH] Installer use static css, fix #2071 --- mod/install.php | 8 ++++ view/install/green.png | Bin 0 -> 323 bytes view/install/info.png | Bin 0 -> 2152 bytes view/install/red.png | Bin 0 -> 316 bytes view/install/style.css | 58 ++++++++++++++++++++++++++++ view/install/yellow.png | Bin 0 -> 280 bytes view/templates/install.tpl | 2 +- view/templates/install_checks.tpl | 16 ++++++-- view/templates/install_db.tpl | 2 +- view/templates/install_settings.tpl | 2 +- 10 files changed, 82 insertions(+), 6 deletions(-) create mode 100644 view/install/green.png create mode 100644 view/install/info.png create mode 100644 view/install/red.png create mode 100644 view/install/style.css create mode 100644 view/install/yellow.png diff --git a/mod/install.php b/mod/install.php index e30c30689..8434b38e3 100755 --- a/mod/install.php +++ b/mod/install.php @@ -11,6 +11,14 @@ function install_init(&$a){ echo "ok"; killme(); } + + // We overwrite current theme css, because during install we could not have a working mod_rewrite + // so we could not have a css at all. Here we set a static css file for the install procedure pages + $a->config['system']['theme'] = "../install"; + $a->theme['stylesheet'] = $a->get_baseurl()."/view/install/style.css"; + + + global $install_wizard_pass; if (x($_POST,'pass')) $install_wizard_pass = intval($_POST['pass']); diff --git a/view/install/green.png b/view/install/green.png new file mode 100644 index 0000000000000000000000000000000000000000..a4de276be9b4d1a08727ec4a52d33e68b0961b2f GIT binary patch literal 323 zcmV-J0lfZ+P)`40kVw{u&@y$2wJ9+cmvCndLm=Dmk`A&rB(@8hkzhnAcfHg7PHBQ z2+3l6FvT$M&CL7%_m?cAQ#(ZmEgWEi5qe0a~+e^7w_LQ_JeeM0rA4im*9Mdc9o<|H3};!b5vos#Bd7xnw7f2=UplD{4^II zZ?87cpYZrG+nq&O!NRxKi3yw}o*R#{Y6s6nk#k!S8psP)1Ua`6*$`0{lF+K6$ho5^ zOIYZ0QRLiSgcKnp{mFW9f3g^;G&cBr)2!5SVmJ+9Nybp6XFWw?mc^D&$%o6&R*Sl z^1|M8SN5C%axd=z3ZA&J@8ZQhXMpUhd(U0od+zF9pqevRcAf?*zP0!4jlE|s1N9DX zwEH5^*APF#83-@$Jaq{s3liLO4uuPm0)`~A8aR9RX{h3TpnwIdIfq>(TnmH&j1Exj zfYDyKjc`MdU5g?Jw*?$)zzD_RFjB>LgOUNnw5z*OY()1CuAm^*M!5P%SArh_Q}D}@ zAirQBjS2Y7a~BQwH!DP_?@bCQ|J&Bq}{~lC|Guj;Z^Zwk* zj-vF=RTn<&wPZ>7R%Ip1Dt7#PEPL^<2;r#x@4kq9PGnRMVvVztb-Dh6QDLp*a<(hd ztM}CI=G<~uQQqiYJgfdBHt%MEK3$=GWuZR=4_d!0WfBqLgaE@az@L^rEF&lDxUEl-p(5yqg~Q%p?rwN?6x3_)P~?qXP#~hP;#zzba-3- z(<}VX;a>R8v#$Iw!Q@mG$u56xJ^*6$Zn|DP7P>NM_1!7&a!uvVG5B0%w%NO< zw&rTg(SYB-es2G~ri+QO@vSvW;U+VSE*`s zR!sfoE7lE`XD4}Szx<~eRNYj^5ZV0q?56}qqc5@o*K0Ea8DRpPydp?nb&iX^ zohIlL$Z_}Zo28Zq%~+S$-joqnRabfIzCzoW?RiaP?;JjvEzS+^I6{rSG|5c5dP1+U zv5q6uu%fuMT~=Afam}y)oSpy0CrLl<{v3FGQs1-5c5RsD=2R65w1PK$#8w$Vp{xi!jT>RmgZlAPl#c#jUVNCzt z**g80x#pJEiKu{O518NCS5!zbU$d?H@x#-&?(a+6N$+FC1NZ%2Hd$uAuG-t2zdFx% zJ`~|Q{CSS}SB)pr*KPT~+QcyJgUu49*`GG8EOPd&``dQyj>)BEtg2n%HK%vk*+ky@ z*Kn1u>h$-wm&#SQ`JVe+YjFSXwA}w6441S_FEva3bNY|){EFhd`pRndZ>##h3Okg3 zD0bZ8BpCNWH9GaLg2nU1<$=waq4So^_O7a#X?J*C81rw_T|VmVuk&g@C$0W>>&LpE z3w=Z{&YyDmUM%+tznhG8Z2x}cYHIub364s;Sz2)}zS7`7L;mNq=EExSEWk{!TH+c} zl9E`GYL#4+3Zxi}3=9o*4J>sH%|Z+;t&A45hw-(S{CvBH510H!xZf3ZexS9St--gvGKJ4zgnS ziF%SLZswf1GiT0Ctf4DCK?iLd;~g^$(9h(rWqz_IzQ?WY=wJ;Y0txb1)jz6{$3C2nK?wi^&)NK8N7-3uk|EX0Hvt(@J7 z5_b^Lhk5*>T^N23R6iXn-kL%c&51$ O00006ht5C7#i%bWNf^FmeT1hDD@7O+(Alip&gcT2!~QSXc))NA{h*dkWseFWOx71 z&wh(Hqv-DLs3C} zZ%j@>#HKOOE6=9jO}a}LC0uXqPAv82%aHhs$x^6+$+ic?AUTfR97Ca|jpt$vjk^+n z53hllK;!y?KOs~|sA_YO#?6IF7)51npmEOvNI-_9C=JAAD^Q70*^WW}Z=Xp=kg{>2 eJjycty3SALnpzFy2)~N}0000{{$title}} +

{{$title}}

{{$pass}}

diff --git a/view/templates/install_checks.tpl b/view/templates/install_checks.tpl index ca12425f0..10a197482 100644 --- a/view/templates/install_checks.tpl +++ b/view/templates/install_checks.tpl @@ -1,12 +1,22 @@ -

{{$title}}

+

{{$title}}

{{$pass}}

{{foreach $checks as $check}} - + {{if $check.help}} - + {{/if}} {{/foreach}}
{{$check.title}} {{if $check.required}}(required){{/if}}
{{$check.title}} + {{if $check.status}} + Ok + {{else}} + {{if $check.required}} + Requirement not satisfied + {{else}} + Optional requirement not satisfied + {{/if}} + {{/if}} + {{if $check.required}}(required){{/if}}
{{$check.help}}
{{$check.help}}
diff --git a/view/templates/install_db.tpl b/view/templates/install_db.tpl index f66bf119e..6b6c1c1e6 100644 --- a/view/templates/install_db.tpl +++ b/view/templates/install_db.tpl @@ -1,6 +1,6 @@ -

{{$title}}

+

{{$title}}

{{$pass}}

diff --git a/view/templates/install_settings.tpl b/view/templates/install_settings.tpl index 735672fe6..8d6823f11 100644 --- a/view/templates/install_settings.tpl +++ b/view/templates/install_settings.tpl @@ -1,6 +1,6 @@ -

{{$title}}

+

{{$title}}

{{$pass}}