diff options
Diffstat (limited to 'view')
-rwxr-xr-x | view/nets.tpl | 2 | ||||
-rwxr-xr-x | view/settings.tpl | 4 | ||||
-rw-r--r-- | view/theme/diabook/icons/ftdevs.gif | bin | 0 -> 1188 bytes | |||
-rwxr-xr-x | view/theme/diabook/icons/scroll_top.png | bin | 0 -> 296 bytes | |||
-rw-r--r-- | view/theme/diabook/nav.tpl | 19 | ||||
-rw-r--r-- | view/theme/diabook/style.css | 23 | ||||
-rw-r--r-- | view/theme/dispy/style.css | 106 |
7 files changed, 78 insertions, 76 deletions
diff --git a/view/nets.tpl b/view/nets.tpl index 0953e66a6..cbadf1361 100755 --- a/view/nets.tpl +++ b/view/nets.tpl @@ -5,7 +5,7 @@ <ul class="nets-ul"> <li class="tool {{ if $sel_all }}selected{{ endif }}"><a href="$base" class="nets-link nets-all">$all</a> {{ for $nets as $net }} - <li class="tool {{ if $net.selected }}selected{{ endif }}"><a href="$base?nets=$net.ref" class="nets-link">$net.name</a></li> + <li class="tool {{ if $net.selected }}selected{{ endif }}"><a href="$base?f=&nets=$net.ref" class="nets-link">$net.name</a></li> {{ endfor }} </ul> diff --git a/view/settings.tpl b/view/settings.tpl index 1172df8b9..b7f427b32 100755 --- a/view/settings.tpl +++ b/view/settings.tpl @@ -60,9 +60,9 @@ $suggestme {{inc field_input.tpl with $field=$expire.days }}{{endinc}} <div class="field input"> - <span class="field_help"><a href="#advaced-expire-popup" id="advenced-expire" class='popupbox' title="$expire.advanced">$expire.label</a></span> + <span class="field_help"><a href="#advanced-expire-popup" id="advanced-expire" class='popupbox' title="$expire.advanced">$expire.label</a></span> <div style="display: none;"> - <div id="advaced-expire-popup" style="width:auto;height:auto;overflow:auto;"> + <div id="advanced-expire-popup" style="width:auto;height:auto;overflow:auto;"> <h3>$expire.advanced</h3> {{ inc field_yesno.tpl with $field=$expire.items }}{{endinc}} {{ inc field_yesno.tpl with $field=$expire.notes }}{{endinc}} diff --git a/view/theme/diabook/icons/ftdevs.gif b/view/theme/diabook/icons/ftdevs.gif Binary files differnew file mode 100644 index 000000000..e0fc25743 --- /dev/null +++ b/view/theme/diabook/icons/ftdevs.gif diff --git a/view/theme/diabook/icons/scroll_top.png b/view/theme/diabook/icons/scroll_top.png Binary files differnew file mode 100755 index 000000000..0e7f7ae6a --- /dev/null +++ b/view/theme/diabook/icons/scroll_top.png diff --git a/view/theme/diabook/nav.tpl b/view/theme/diabook/nav.tpl index 1f2f64f6a..027a8b7b7 100644 --- a/view/theme/diabook/nav.tpl +++ b/view/theme/diabook/nav.tpl @@ -25,7 +25,7 @@ <span class="icon contacts">$nav.contacts.1</span></a> <span id="intro-update" class="nav-notify"></span> <ul id="nav-contacts-menu" class="menu-popup"> - <li id="nav-contacts-see-intro"><a href="$nav.notifications.0">Kontaktanfragen</a><span id="intro-update" class="nav-notify"></span></li> + <li id="nav-contacts-see-intro"><a href="$nav.notifications.0">$nav.introductions.1</a><span id="intro-update" class="nav-notify"></span></li> <li id="nav-contacts-all"><a href="contacts">$nav.contacts.1</a></li> </ul> </li> @@ -38,9 +38,9 @@ <span id="mail-update" class="nav-notify"></span> <ul id="nav-messages-menu" class="menu-popup"> <li id="nav-messages-see-all"><a href="$nav.messages.0">$nav.messages.1</a></li> - <li id="nav-messages-inbox"><a href="$nav.messages.0">Eingang</a></li> - <li id="nav-messages-outbox"><a href="message/sent">Ausgang</a></li> - <li id="nav-messages-new"><a href="message/new">Neue Nachricht</a></li> + <li id="nav-messages-see-all"><a href="$nav.messages.inbox.0">$nav.messages.inbox.1</a></li> + <li id="nav-messages-see-all"><a href="$nav.messages.outbox.0">$nav.messages.outbox.1</a></li> + <li id="nav-messages-see-all"><a href="$nav.messages.new.0">$nav.messages.new.1</a></li> </ul> </li> {{ endif }} @@ -138,18 +138,15 @@ </nav> +<div style="position: fixed; bottom: 5px; right: 10px;"><a href="javascript:scroll(0,0); "><img src="view/theme/diabook/icons/scroll_top.png" title="scroll to top"></a></div> <div style="position: fixed; bottom: 5px; left: 25px;">$langselector</div> -<div style="position: fixed; bottom: 7px; left: 5px;"><a href="http://pad.toktan.org/p/diabook" target="blank" ><img src="images/bug-x.gif" title="Fehlerreport für das Theme diaBook erstellen"></a></div> - - -<a class="$nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a> - - +<div style="position: fixed; bottom: 25px; left: 5px;"><a href="http://pad.toktan.org/p/diabook" target="blank" ><img src="view/theme/diabook/icons/ftdevs.gif" title="Fehlerreport für das Theme diaBook erstellen"/></a></div> <ul id="nav-notifications-template" style="display:none;" rel="template"> - <li class="{4}"><a href="{0}"><img src="{1}" height="24" width="24" alt="" />{2} <span class="notif-when">{3}</span></a></li> + <li><a href="{0}"><img src="{1}">{2} <span class="notif-when">{3}</span></a></li> </ul> + {# {{ if $nav.logout }}<a id="nav-logout-link" class="nav-link $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a> {{ endif }} diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css index ddbbc2e53..fe1d3d882 100644 --- a/view/theme/diabook/style.css +++ b/view/theme/diabook/style.css @@ -619,6 +619,7 @@ nav .nav-menu-search { margin: 3px 17px; margin-right: 0px; height: 17px; + width: 205px; } nav .nav-menu-icon { @@ -856,7 +857,7 @@ aside { /* background: #F1F1F1; */ } aside .vcard .fn { - font-size: 16px; + font-size: 18px; font-weight: bold; margin-bottom: 5px; } @@ -1427,12 +1428,13 @@ section { margin-top: 10px; } #profile-jot-form #jot-title { - border: 0px; - margin: 0px; - height: 20px; - width: 700px; - font-weight: bold; - border: 1px solid #ffffff; + + border-radius: 5px 5px 5px 5px; + font-weight: bold; + height: 20px; + margin: 0 0 5px; + width: 60%; + border: 1px solid #ffffff; } #profile-jot-form #jot-title:-webkit-input-placeholder { font-weight: normal; @@ -1883,7 +1885,12 @@ blockquote { padding-left: 9px; margin: 0 0 0 .8ex; } - +.aprofile dt{ +box-shadow: 1px 1px 5px 0; + color: #666666; + margin: 15px 0 5px; + padding-left: 5px; + } /* ================== */ /* = Contacts Block = */ /* ================== */ diff --git a/view/theme/dispy/style.css b/view/theme/dispy/style.css index bda163b8f..671d9652b 100644 --- a/view/theme/dispy/style.css +++ b/view/theme/dispy/style.css @@ -24,9 +24,9 @@ audio:not([controls]) { display: none; } -/* ============================================================================= - Base - ========================================================================== */ +/* + * Base + */ /* * 1. Correct text resizing oddly in IE6/7 when body font-size is set using em units @@ -177,14 +177,14 @@ input[type=submit] { padding: 1em; } .pager { - padding-top: 30px; + margin-top: 60px; display: block; clear: both; text-align: center; } .pager span { padding: 4px; - margin:4px; + margin: 4px; } .pager_current { background-color: #729fcf; @@ -613,25 +613,33 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link aside { position: absolute; right: 15px; - width: 255px; + width: 230px; font-size: smaller; } .vcard .fn { font-size: 1.7em; - font-weight: 700; + font-weight: bold; border-bottom: 1px solid #729fcf; - padding-top: 1px; + padding-bottom: 3px; } .vcard #profile-photo-wrapper { - margin: 10px 0px; + margin: 20px; +} +.vcard #profile-photo-wrapper img { + box-shadow: 3px 3px 10px 0; } aside h4 { font-size: 1.2em; } - aside #viewcontacts { text-align: right; } +.aprofile dt { + box-shadow: 1px 1px 5px 0; + color: #666666; + margin: 15px 0 5px; + padding-left: 5px; +} #profile-extra-links ul { margin-left: 0px; padding-left: 0px; @@ -750,34 +758,27 @@ aside #viewcontacts { } #jot #jot-title { border: 0px; - margin: 0px; + margin: 0 0 5px; height: 20px; - width: 100%; + width: 90%; font-weight: bold; - border: 1px solid #ffffff; border-radius: 5px; -} -#jot #jot-title:-webkit-input-placeholder { - font-weight: normal; -} -#jot #jot-title:-moz-placeholder { - font-weight: normal; -} -#jot #jot-title:placeholder { - font-weight: normal; + vertical-align: middle; + padding: 5px 1px; } #jot #jot-title:hover, #jot #jot-title:focus { - border: 1px solid #999999; + border: 1px solid #999; border-radius: 5px; } #jot #character-counter { - width: 80px; + width: 40px; float: right; text-align: right; height: 20px; line-height: 20px; - padding-right: 20px; + padding: 5px; + margin: 0 0 5px; } #profile-jot-text_tbl { margin-bottom: 10px; @@ -796,10 +797,6 @@ aside #viewcontacts { float: left; margin-left: 10px; } -#character-counter { - float:right; - padding:8px 10px; -} #profile-rotator-wrapper { float: right; } @@ -959,7 +956,7 @@ aside #viewcontacts { section { margin: 20px 6% 0 4%; font-size: 0.8em; - padding-right: 250px; + padding-right: 220px; min-width: 475px; } @@ -1005,7 +1002,6 @@ section { .wall-item-content-wrapper { position: relative; padding: 10px; - overflow-x: auto; width: auto; } .wall-item-outside-wrapper .wall-item-comment-wrapper { @@ -1110,9 +1106,9 @@ section { clear:both; } .wall-item-location { - margin-top: 5px; + margin-top: 10px; width: 100px; - overflow:hidden; + overflow: hidden; text-overflow: ellipsis; -o-text-overflow: ellipsis; } @@ -1133,14 +1129,14 @@ section { display: none; } .wallwall .wwto { - left:-10px; + left: 5px; margin: 0; - position:absolute; - top:65px; + position: absolute; + top: 75px; width: 30px; - z-index:10001; - width:30px; - height:30px; + z-index: 10001; + width: 30px; + height: 30px; } .wallwall .wwto img { width: 30px !important; @@ -1151,8 +1147,8 @@ section { } .wall-item-arrowphoto-wrapper { position: absolute; - left: 20px; - top: 70px; + left: 35px; + top: 80px; z-index: 10002; } .wall-item-photo-menu { @@ -1556,10 +1552,11 @@ div[id$="wrapper"] br { .view-contact-wrapper, .contact-entry-wrapper { float: left; - margin-right: 20px; - margin-bottom: 20px; + margin-right: 5px; + margin-bottom: 40px; width: 120px; - /*height: 120px;*/ + height: 120px; + padding: 3px; position: relative; } .contact-direction-wrapper { @@ -1703,13 +1700,15 @@ div[id$="wrapper"] br { } #settings-nickname-desc { - background-color: #def; + background-color: #eee; -webkit-border-radius: 5px; -moz-border-radius: 5px; border-radius: 5px; padding: 5px; } - +#settings-default-perms { + margin-bottom: 20px; +} #register-form div, #profile-edit-form div { clear: both; @@ -1732,11 +1731,11 @@ div[id$="wrapper"] br { margin: 30px 0px; } .profile-edit-side-div { - margin-top: 10px; + margin-top: 0px; } .profile-edit-side-link { float: right; - margin: 10px 20px -16px 0; + margin: 0px 20px -18px 0; } .profile-listing { float: left; @@ -2112,17 +2111,16 @@ div[id$="wrapper"] br { display: block; font-size: 1.077em; /*font-weight: bold;*/ - margin-bottom: 0.2em; - margin: 0 10px 0.2em 0; + margin: 0 10px 0.5em 0; border: 1px #999 solid; padding: 5px; - background: #def; + background: #eee; vertical-align: middle; } .field input { width: 250px; height: 25px; - border: 1px #666 solid; + border: 1px #999 solid; } .field textarea { width: 80%; @@ -2147,8 +2145,8 @@ div[id$="wrapper"] br { text-decoration: none; } .field .onoff .on { - background: url("../../../images/onoff.jpg") no-repeat 42px 1px #def; - color: #333; + background: url("../../../images/onoff.jpg") no-repeat 42px 1px #999; + color: #111; text-align: left; } .field .onoff .off { |