From 9f441731af6929272b27ad9097235aab82f25b29 Mon Sep 17 00:00:00 2001 From: tommy tomson Date: Fri, 9 Mar 2012 13:23:38 +0100 Subject: [PATCH 1/2] fixes in css --- view/theme/diabook-blue/comment_item.tpl | 35 ------------------------ view/theme/diabook-blue/nav.tpl | 4 +-- view/theme/diabook-blue/style.css | 16 +++++++---- view/theme/diabook/comment_item.tpl | 35 ------------------------ view/theme/diabook/nav.tpl | 4 +-- view/theme/diabook/style.css | 15 ++++++---- 6 files changed, 23 insertions(+), 86 deletions(-) delete mode 100644 view/theme/diabook-blue/comment_item.tpl delete mode 100644 view/theme/diabook/comment_item.tpl diff --git a/view/theme/diabook-blue/comment_item.tpl b/view/theme/diabook-blue/comment_item.tpl deleted file mode 100644 index 85176732b..000000000 --- a/view/theme/diabook-blue/comment_item.tpl +++ /dev/null @@ -1,35 +0,0 @@ -
-
- - - - - - - -
- $mytitle -
-
- - - {{ if $qcomment }} -
    - {{ for $qcomment as $qc }} - - {{ endfor }} -
- {{ endif }} - -
- - -
-
- -
diff --git a/view/theme/diabook-blue/nav.tpl b/view/theme/diabook-blue/nav.tpl index d0ff06673..289581c36 100644 --- a/view/theme/diabook-blue/nav.tpl +++ b/view/theme/diabook-blue/nav.tpl @@ -140,8 +140,8 @@
-
$langselector
-
+
$langselector
+
diff --git a/view/theme/diabook-blue/style.css b/view/theme/diabook-blue/style.css index 5b7a3f3d6..7f5fe1fec 100644 --- a/view/theme/diabook-blue/style.css +++ b/view/theme/diabook-blue/style.css @@ -515,7 +515,7 @@ header { top: 0px; margin: 0px; padding: 0px; - width: 20%; + width: 22%; height: 32px; background: #1872a2; background-color: #1872a2; @@ -529,8 +529,9 @@ header #site-location { } header #banner { overflow: hidden; - text-align: center; - width: 100%; + text-align: banner; + width: 82%; + margin-left: 25%; } header #banner a, header #banner a:active, @@ -556,12 +557,12 @@ nav { width: 80%; height: 32px; position: fixed; - left: 20%; + left: 22%; top: 0px; padding: 0px; background: #1872a2; - color: #1872a2; - z-index: 100; + color: #ffffff; + z-index: 99; border-bottom: 1px; border-bottom-color: black; border-bottom-style: inset; @@ -1036,6 +1037,9 @@ section { width: 800px; padding: 0px 0px 0px 12px; } +#contact-edit-end { + margin-top: 140%; + } .pager { padding: 10px; text-align: center; diff --git a/view/theme/diabook/comment_item.tpl b/view/theme/diabook/comment_item.tpl deleted file mode 100644 index 85176732b..000000000 --- a/view/theme/diabook/comment_item.tpl +++ /dev/null @@ -1,35 +0,0 @@ -
-
- - - - - - - -
- $mytitle -
-
- - - {{ if $qcomment }} -
    - {{ for $qcomment as $qc }} - - {{ endfor }} -
- {{ endif }} - -
- - -
-
- -
diff --git a/view/theme/diabook/nav.tpl b/view/theme/diabook/nav.tpl index d0ff06673..289581c36 100644 --- a/view/theme/diabook/nav.tpl +++ b/view/theme/diabook/nav.tpl @@ -140,8 +140,8 @@
-
$langselector
-
+
$langselector
+
diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css index bccfea149..6e3909ab4 100644 --- a/view/theme/diabook/style.css +++ b/view/theme/diabook/style.css @@ -515,7 +515,7 @@ header { top: 0px; margin: 0px; padding: 0px; - width: 20%; + width: 22%; height: 32px; background: #000; z-index: 100; @@ -528,8 +528,9 @@ header #site-location { } header #banner { overflow: hidden; - text-align: center; - width: 100%; + text-align: left; + width: 82%%; + margin-left: 25%; } header #banner a, header #banner a:active, @@ -555,12 +556,12 @@ nav { width: 80%; height: 32px; position: fixed; - left: 20%; + left: 22%; top: 0px; padding: 0px; background: #000; color: #ffffff; - z-index: 100; + z-index: 99; -webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7); -moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7); box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7); @@ -1035,12 +1036,14 @@ section { width: 800px; padding: 0px 0px 0px 12px; } +#contact-edit-end { + margin-top: 140%; + } .pager { padding: 10px; text-align: center; font-size: 1.0em; } - .tabs { background-position: 0 -20px; From 8fe4645a5d97a66b823744248698c624f7146d5b Mon Sep 17 00:00:00 2001 From: tommy tomson Date: Fri, 9 Mar 2012 18:15:27 +0100 Subject: [PATCH 2/2] add js to hide nav-menus, when clicked outside --- view/theme/diabook-blue/icons/starred.png | Bin 1617 -> 501 bytes view/theme/diabook-blue/theme.php | 66 ++++++++++++++++++++++ view/theme/diabook/icons/starred.png | Bin 1617 -> 501 bytes view/theme/diabook/nav.tpl | 2 + view/theme/diabook/theme.php | 66 ++++++++++++++++++++++ 5 files changed, 134 insertions(+) create mode 100755 view/theme/diabook-blue/theme.php create mode 100755 view/theme/diabook/theme.php diff --git a/view/theme/diabook-blue/icons/starred.png b/view/theme/diabook-blue/icons/starred.png index 72a49c157c8ccf21376e953984ffc30c6fe78b06..2b82dfca319a3a370d8c7e1242b792fbbf963c86 100755 GIT binary patch delta 430 zcmV;f0a560-7Gk*;$5r>!!W&i*IbxA})R5;6p(?4qz zVGsuJ-+PzbMLkIn)J}^P_7L&`#KOiVjR7kQMFg9GDEdLP(Mqtg6bnJHu+=6u3L-0R zqhO;mhjAzDcg$|kn|6%H z=70jQ+EnLM)QCv3sfq#d1P*=V{$~j9ZbxlUNi_17rOilQO$GBZr zCXjR1ODV~D@ALk~Y7lA)#Ztt!y5f}5zdPs<;7}xWdrv|;K2~wCtmzdT41&yV`UhOX z6?_Wc5bKe4Tx0C?Jslgn=#RTRd5V~?km60yOw z#j4O1i#9?@G<~Q|glKEWu9Y?zYnl`%LaHX?YkSDeczS1?KGX&3h8-=4J>nr&`~el} zf?ZcAm8yb}D%Mm8RH>*NRLsJUnU+8~t8>5eo$q}2TwTb0>VJlz$_UsDV(nB*qOrOr zcKt+#SDB!|gzH6Nv0h&SaKljXk9hI}2Ee_Uo$LP@6HOU;VC)9E&B)sX<1%E=d!dfO zybH`-io+OkyMerJtgbz9*b&Nq^LJx8*CDvipMa|BOx58_jzem<;2R0~`SUXz9}{z!VsTtDWU{fjwZ9 z{CIJBh&O`u+B*Zj@xey-tTW_%-IV1DFb&4-XzN^M#JSp8s0}&4yzic=0|hYt3gh}v zC$le5wWWc6=7fwY=SFzTKfO4_TcN5i4fHb~>7KI!ynhavZ(Uuf4*3scurln;W}0sK zEHDe%De6cxEqoLLhbkomRU`oq(fD|DsiWzRS#2JUs~71Z5jdQubhFT#N>r}v3%<8~ zDjc2rEwmjpYymnc?IV~0Dl zd=x$_1o&J+qKR-(1YAL+cQNWVUo#Jxi{_j;k1$V~r_2*(*_<=qG?zvUt74U{BEovZ znzs&FXRKm!6YHQ=w&tyaR^^!&@KSe8zo1O9WPfTSGpr+t*g)g6g+vh{A(oe8fQ4>& zMf>eeEDqcDaZwCICBP1ETDu~k7vlqR4@>IPmT2KTpilS{1 zu}~3hV=*mO(AXfqAnupvTb|SpSgbmQmGVlU1tDVrIebKQUlPc z>pDxNQvU}4Kr)%sP1D@NIdgH&T&8L6NhXu}-)aSb1^{b39#7CTO;gh}qg*aG3nBWd zQij2p0Kql?WqurhTi11ewOaK%j(?*AsIs2kp1$0-#lFeONw<_FRaJ$eD8l7-MO0PQ z0H9K-luM=3oKtbCl}ZJQqHwFtvVA_^Rq^QY!>zGcYyA4iFIw4Mn=YlbBp;BXPgxZ1u7Pb z#5rfVT)s3q@_g8eCob2TiGK*}x5F4L%Tk08BgJB&lMBJTUN49U`CJZCN~){#ypUD7 zeJVBO)Owbf&!_8=NK@W0R#RtJryRa}Cx7eq&3s2khcpa>B9W%Nt~dCW{{a9X8g14% z$H9efiwC;9xAK9({;9T&8_tG;!Fy}tEt@}m`fSdm)7;~!f9H?-Q*sO0h3XPOQ#foG zrg0@6k3|MA4o)Q6tp0d&>qFBFObeAyx5U=A&!lGqE|+F-;`g)j*}{_XcW&PqI(6pM z_^US)Z|1*#-n9H>XFtB*_H^_~=J1h2Z>{x-P)+{<%pw}k+Ei^w00000NkvXXu0mjf Dq@?=~ diff --git a/view/theme/diabook-blue/theme.php b/view/theme/diabook-blue/theme.php new file mode 100755 index 000000000..0a20c9fbc --- /dev/null +++ b/view/theme/diabook-blue/theme.php @@ -0,0 +1,66 @@ +theme_info = array( + 'extends' => 'diabook', +); + +$a->page['htmlhead'] .= <<< EOT + +EOT; diff --git a/view/theme/diabook/icons/starred.png b/view/theme/diabook/icons/starred.png index 72a49c157c8ccf21376e953984ffc30c6fe78b06..2b82dfca319a3a370d8c7e1242b792fbbf963c86 100755 GIT binary patch delta 430 zcmV;f0a560-7Gk*;$5r>!!W&i*IbxA})R5;6p(?4qz zVGsuJ-+PzbMLkIn)J}^P_7L&`#KOiVjR7kQMFg9GDEdLP(Mqtg6bnJHu+=6u3L-0R zqhO;mhjAzDcg$|kn|6%H z=70jQ+EnLM)QCv3sfq#d1P*=V{$~j9ZbxlUNi_17rOilQO$GBZr zCXjR1ODV~D@ALk~Y7lA)#Ztt!y5f}5zdPs<;7}xWdrv|;K2~wCtmzdT41&yV`UhOX z6?_Wc5bKe4Tx0C?Jslgn=#RTRd5V~?km60yOw z#j4O1i#9?@G<~Q|glKEWu9Y?zYnl`%LaHX?YkSDeczS1?KGX&3h8-=4J>nr&`~el} zf?ZcAm8yb}D%Mm8RH>*NRLsJUnU+8~t8>5eo$q}2TwTb0>VJlz$_UsDV(nB*qOrOr zcKt+#SDB!|gzH6Nv0h&SaKljXk9hI}2Ee_Uo$LP@6HOU;VC)9E&B)sX<1%E=d!dfO zybH`-io+OkyMerJtgbz9*b&Nq^LJx8*CDvipMa|BOx58_jzem<;2R0~`SUXz9}{z!VsTtDWU{fjwZ9 z{CIJBh&O`u+B*Zj@xey-tTW_%-IV1DFb&4-XzN^M#JSp8s0}&4yzic=0|hYt3gh}v zC$le5wWWc6=7fwY=SFzTKfO4_TcN5i4fHb~>7KI!ynhavZ(Uuf4*3scurln;W}0sK zEHDe%De6cxEqoLLhbkomRU`oq(fD|DsiWzRS#2JUs~71Z5jdQubhFT#N>r}v3%<8~ zDjc2rEwmjpYymnc?IV~0Dl zd=x$_1o&J+qKR-(1YAL+cQNWVUo#Jxi{_j;k1$V~r_2*(*_<=qG?zvUt74U{BEovZ znzs&FXRKm!6YHQ=w&tyaR^^!&@KSe8zo1O9WPfTSGpr+t*g)g6g+vh{A(oe8fQ4>& zMf>eeEDqcDaZwCICBP1ETDu~k7vlqR4@>IPmT2KTpilS{1 zu}~3hV=*mO(AXfqAnupvTb|SpSgbmQmGVlU1tDVrIebKQUlPc z>pDxNQvU}4Kr)%sP1D@NIdgH&T&8L6NhXu}-)aSb1^{b39#7CTO;gh}qg*aG3nBWd zQij2p0Kql?WqurhTi11ewOaK%j(?*AsIs2kp1$0-#lFeONw<_FRaJ$eD8l7-MO0PQ z0H9K-luM=3oKtbCl}ZJQqHwFtvVA_^Rq^QY!>zGcYyA4iFIw4Mn=YlbBp;BXPgxZ1u7Pb z#5rfVT)s3q@_g8eCob2TiGK*}x5F4L%Tk08BgJB&lMBJTUN49U`CJZCN~){#ypUD7 zeJVBO)Owbf&!_8=NK@W0R#RtJryRa}Cx7eq&3s2khcpa>B9W%Nt~dCW{{a9X8g14% z$H9efiwC;9xAK9({;9T&8_tG;!Fy}tEt@}m`fSdm)7;~!f9H?-Q*sO0h3XPOQ#foG zrg0@6k3|MA4o)Q6tp0d&>qFBFObeAyx5U=A&!lGqE|+F-;`g)j*}{_XcW&PqI(6pM z_^US)Z|1*#-n9H>XFtB*_H^_~=J1h2Z>{x-P)+{<%pw}k+Ei^w00000NkvXXu0mjf Dq@?=~ diff --git a/view/theme/diabook/nav.tpl b/view/theme/diabook/nav.tpl index 289581c36..5776b6cf7 100644 --- a/view/theme/diabook/nav.tpl +++ b/view/theme/diabook/nav.tpl @@ -26,6 +26,7 @@ + {{ endif }} {{ if $nav.messages }} @@ -145,6 +146,7 @@ + diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php new file mode 100755 index 000000000..0a20c9fbc --- /dev/null +++ b/view/theme/diabook/theme.php @@ -0,0 +1,66 @@ +theme_info = array( + 'extends' => 'diabook', +); + +$a->page['htmlhead'] .= <<< EOT + +EOT;