diff options
| author | tomtom84 <63dc41d76451@ba77e90e49a6.anonbox.net> | 2012-04-06 04:29:01 -0700 |
|---|---|---|
| committer | tomtom84 <63dc41d76451@ba77e90e49a6.anonbox.net> | 2012-04-06 04:29:01 -0700 |
| commit | adf3ad5fd668633dcaf16be875f87bd1fcacfc8f (patch) | |
| tree | 13c32b977cd993d035c43a4a0fff342b43ae6555 /view | |
| parent | 4f9588d9eeb0dea7d824760f899094f0c98763c3 (diff) | |
| parent | f980b79edcff78a849d65de15f36f2b0475665d7 (diff) | |
| download | volse-hubzilla-adf3ad5fd668633dcaf16be875f87bd1fcacfc8f.tar.gz volse-hubzilla-adf3ad5fd668633dcaf16be875f87bd1fcacfc8f.tar.bz2 volse-hubzilla-adf3ad5fd668633dcaf16be875f87bd1fcacfc8f.zip | |
Merge pull request #210 from tomtom84/master
fixes in diabook-derivates
Diffstat (limited to 'view')
173 files changed, 126 insertions, 51 deletions
diff --git a/view/theme/diabook-aerith/communityhome.tpl b/view/theme/diabook-aerith/communityhome.tpl index 4873cdd14..4873cdd14 100644..100755 --- a/view/theme/diabook-aerith/communityhome.tpl +++ b/view/theme/diabook-aerith/communityhome.tpl diff --git a/view/theme/diabook-aerith/contact_template.tpl b/view/theme/diabook-aerith/contact_template.tpl index 48930b48a..48930b48a 100644..100755 --- a/view/theme/diabook-aerith/contact_template.tpl +++ b/view/theme/diabook-aerith/contact_template.tpl diff --git a/view/theme/diabook-aerith/directory_item.tpl b/view/theme/diabook-aerith/directory_item.tpl index db1936e4b..db1936e4b 100644..100755 --- a/view/theme/diabook-aerith/directory_item.tpl +++ b/view/theme/diabook-aerith/directory_item.tpl diff --git a/view/theme/diabook-aerith/fpostit/fpostit.js b/view/theme/diabook-aerith/fpostit/fpostit.js index d183c7573..d183c7573 100644..100755 --- a/view/theme/diabook-aerith/fpostit/fpostit.js +++ b/view/theme/diabook-aerith/fpostit/fpostit.js diff --git a/view/theme/diabook-aerith/group_side.tpl b/view/theme/diabook-aerith/group_side.tpl index af183d04d..af183d04d 100644..100755 --- a/view/theme/diabook-aerith/group_side.tpl +++ b/view/theme/diabook-aerith/group_side.tpl diff --git a/view/theme/diabook-aerith/icons/attach.png b/view/theme/diabook-aerith/icons/attach.png Binary files differindex 1958041cf..1958041cf 100644..100755 --- a/view/theme/diabook-aerith/icons/attach.png +++ b/view/theme/diabook-aerith/icons/attach.png diff --git a/view/theme/diabook-aerith/icons/audio.png b/view/theme/diabook-aerith/icons/audio.png Binary files differindex 8d779a409..8d779a409 100644..100755 --- a/view/theme/diabook-aerith/icons/audio.png +++ b/view/theme/diabook-aerith/icons/audio.png diff --git a/view/theme/diabook-aerith/icons/camera.png b/view/theme/diabook-aerith/icons/camera.png Binary files differindex a5c7f1236..a5c7f1236 100644..100755 --- a/view/theme/diabook-aerith/icons/camera.png +++ b/view/theme/diabook-aerith/icons/camera.png diff --git a/view/theme/diabook-aerith/icons/close_box.png b/view/theme/diabook-aerith/icons/close_box.png Binary files differindex 28e2675b8..28e2675b8 100644..100755 --- a/view/theme/diabook-aerith/icons/close_box.png +++ b/view/theme/diabook-aerith/icons/close_box.png diff --git a/view/theme/diabook-aerith/icons/drop.png b/view/theme/diabook-aerith/icons/drop.png Binary files differindex 2abb82ef2..2abb82ef2 100644..100755 --- a/view/theme/diabook-aerith/icons/drop.png +++ b/view/theme/diabook-aerith/icons/drop.png diff --git a/view/theme/diabook-aerith/icons/file_as.png b/view/theme/diabook-aerith/icons/file_as.png Binary files differindex 16713fa53..16713fa53 100644..100755 --- a/view/theme/diabook-aerith/icons/file_as.png +++ b/view/theme/diabook-aerith/icons/file_as.png diff --git a/view/theme/diabook-aerith/icons/link.png b/view/theme/diabook-aerith/icons/link.png Binary files differindex 0ef666a67..0ef666a67 100644..100755 --- a/view/theme/diabook-aerith/icons/link.png +++ b/view/theme/diabook-aerith/icons/link.png diff --git a/view/theme/diabook-aerith/icons/lock.png b/view/theme/diabook-aerith/icons/lock.png Binary files differindex 7e34bf279..7e34bf279 100644..100755 --- a/view/theme/diabook-aerith/icons/lock.png +++ b/view/theme/diabook-aerith/icons/lock.png diff --git a/view/theme/diabook-aerith/icons/lupe.png b/view/theme/diabook-aerith/icons/lupe.png Binary files differindex f8b228347..f8b228347 100644..100755 --- a/view/theme/diabook-aerith/icons/lupe.png +++ b/view/theme/diabook-aerith/icons/lupe.png diff --git a/view/theme/diabook-aerith/icons/messages.png b/view/theme/diabook-aerith/icons/messages.png Binary files differindex e2bf7d24d..e2bf7d24d 100644..100755 --- a/view/theme/diabook-aerith/icons/messages.png +++ b/view/theme/diabook-aerith/icons/messages.png diff --git a/view/theme/diabook-aerith/icons/messages2.png b/view/theme/diabook-aerith/icons/messages2.png Binary files differindex e2bf7d24d..e2bf7d24d 100644..100755 --- a/view/theme/diabook-aerith/icons/messages2.png +++ b/view/theme/diabook-aerith/icons/messages2.png diff --git a/view/theme/diabook-aerith/icons/next.png b/view/theme/diabook-aerith/icons/next.png Binary files differindex 7b5e25b90..7b5e25b90 100644..100755 --- a/view/theme/diabook-aerith/icons/next.png +++ b/view/theme/diabook-aerith/icons/next.png diff --git a/view/theme/diabook-aerith/icons/notifications.png b/view/theme/diabook-aerith/icons/notifications.png Binary files differindex 2b4fbb818..2b4fbb818 100644..100755 --- a/view/theme/diabook-aerith/icons/notifications.png +++ b/view/theme/diabook-aerith/icons/notifications.png diff --git a/view/theme/diabook-aerith/icons/notify.png b/view/theme/diabook-aerith/icons/notify.png Binary files differindex 9765bfd53..9765bfd53 100644..100755 --- a/view/theme/diabook-aerith/icons/notify.png +++ b/view/theme/diabook-aerith/icons/notify.png diff --git a/view/theme/diabook-aerith/icons/notify2.png b/view/theme/diabook-aerith/icons/notify2.png Binary files differindex 9765bfd53..9765bfd53 100644..100755 --- a/view/theme/diabook-aerith/icons/notify2.png +++ b/view/theme/diabook-aerith/icons/notify2.png diff --git a/view/theme/diabook-aerith/icons/pencil.png b/view/theme/diabook-aerith/icons/pencil.png Binary files differindex 772e49b17..772e49b17 100644..100755 --- a/view/theme/diabook-aerith/icons/pencil.png +++ b/view/theme/diabook-aerith/icons/pencil.png diff --git a/view/theme/diabook-aerith/icons/photo-menu.jpg b/view/theme/diabook-aerith/icons/photo-menu.jpg Binary files differindex fde5eb535..fde5eb535 100644..100755 --- a/view/theme/diabook-aerith/icons/photo-menu.jpg +++ b/view/theme/diabook-aerith/icons/photo-menu.jpg diff --git a/view/theme/diabook-aerith/icons/prev.png b/view/theme/diabook-aerith/icons/prev.png Binary files differindex 55c1464ba..55c1464ba 100644..100755 --- a/view/theme/diabook-aerith/icons/prev.png +++ b/view/theme/diabook-aerith/icons/prev.png diff --git a/view/theme/diabook-aerith/icons/recycle.png b/view/theme/diabook-aerith/icons/recycle.png Binary files differindex c3b8d2bf4..c3b8d2bf4 100644..100755 --- a/view/theme/diabook-aerith/icons/recycle.png +++ b/view/theme/diabook-aerith/icons/recycle.png diff --git a/view/theme/diabook-aerith/icons/remote.png b/view/theme/diabook-aerith/icons/remote.png Binary files differindex a560cc55e..a560cc55e 100644..100755 --- a/view/theme/diabook-aerith/icons/remote.png +++ b/view/theme/diabook-aerith/icons/remote.png diff --git a/view/theme/diabook-aerith/icons/scroll_top.png b/view/theme/diabook-aerith/icons/scroll_top.png Binary files differindex 0e7f7ae6a..0e7f7ae6a 100644..100755 --- a/view/theme/diabook-aerith/icons/scroll_top.png +++ b/view/theme/diabook-aerith/icons/scroll_top.png diff --git a/view/theme/diabook-aerith/icons/selected.png b/view/theme/diabook-aerith/icons/selected.png Binary files differindex 2a30ae252..2a30ae252 100644..100755 --- a/view/theme/diabook-aerith/icons/selected.png +++ b/view/theme/diabook-aerith/icons/selected.png diff --git a/view/theme/diabook-aerith/icons/star.png b/view/theme/diabook-aerith/icons/star.png Binary files differindex 0b00cb189..0b00cb189 100644..100755 --- a/view/theme/diabook-aerith/icons/star.png +++ b/view/theme/diabook-aerith/icons/star.png diff --git a/view/theme/diabook-aerith/icons/starred.png b/view/theme/diabook-aerith/icons/starred.png Binary files differindex 2b82dfca3..2b82dfca3 100644..100755 --- a/view/theme/diabook-aerith/icons/starred.png +++ b/view/theme/diabook-aerith/icons/starred.png diff --git a/view/theme/diabook-aerith/icons/tagged.png b/view/theme/diabook-aerith/icons/tagged.png Binary files differindex 144649ef8..144649ef8 100644..100755 --- a/view/theme/diabook-aerith/icons/tagged.png +++ b/view/theme/diabook-aerith/icons/tagged.png diff --git a/view/theme/diabook-aerith/icons/unlock.png b/view/theme/diabook-aerith/icons/unlock.png Binary files differindex a0cda0ae5..a0cda0ae5 100644..100755 --- a/view/theme/diabook-aerith/icons/unlock.png +++ b/view/theme/diabook-aerith/icons/unlock.png diff --git a/view/theme/diabook-aerith/icons/unstarred.png b/view/theme/diabook-aerith/icons/unstarred.png Binary files differindex ba3183f5c..ba3183f5c 100644..100755 --- a/view/theme/diabook-aerith/icons/unstarred.png +++ b/view/theme/diabook-aerith/icons/unstarred.png diff --git a/view/theme/diabook-aerith/icons/video.png b/view/theme/diabook-aerith/icons/video.png Binary files differindex a03d1d818..a03d1d818 100644..100755 --- a/view/theme/diabook-aerith/icons/video.png +++ b/view/theme/diabook-aerith/icons/video.png diff --git a/view/theme/diabook-aerith/icons/weblink.png b/view/theme/diabook-aerith/icons/weblink.png Binary files differindex 216e78344..216e78344 100644..100755 --- a/view/theme/diabook-aerith/icons/weblink.png +++ b/view/theme/diabook-aerith/icons/weblink.png diff --git a/view/theme/diabook-aerith/jot.tpl b/view/theme/diabook-aerith/jot.tpl index ee30da7bf..ee30da7bf 100644..100755 --- a/view/theme/diabook-aerith/jot.tpl +++ b/view/theme/diabook-aerith/jot.tpl diff --git a/view/theme/diabook-aerith/mail_conv.tpl b/view/theme/diabook-aerith/mail_conv.tpl index 989f17878..989f17878 100644..100755 --- a/view/theme/diabook-aerith/mail_conv.tpl +++ b/view/theme/diabook-aerith/mail_conv.tpl diff --git a/view/theme/diabook-aerith/nav.tpl b/view/theme/diabook-aerith/nav.tpl index f84b902d5..6fab83afc 100644 --- a/view/theme/diabook-aerith/nav.tpl +++ b/view/theme/diabook-aerith/nav.tpl @@ -22,7 +22,7 @@ <span class="icon contacts">$nav.contacts.1</span> <span id="intro-update" class="nav-notify"></span></a> <ul id="nav-contacts-menu" class="menu-popup"> - <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-see-intro"><a href="$nav.notifications.0">$nav.introductions.1</a><span id="intro-update-li" class="nav-notify"></span></li> <li id="nav-contacts-all"><a href="contacts">$nav.contacts.1</a></li> </ul> </li> @@ -35,7 +35,7 @@ <span id="mail-update" class="nav-notify"></span></a> <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-see-all"><a href="$nav.messages.inbox.0">$nav.messages.inbox.1</a></li> + <li id="nav-messages-see-all"><a href="$nav.messages.inbox.0">$nav.messages.inbox.1</a><span id="mail-update-li" class="nav-notify"></span></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> diff --git a/view/theme/diabook-aerith/photo_view.tpl b/view/theme/diabook-aerith/photo_view.tpl index 511fc73ac..511fc73ac 100644..100755 --- a/view/theme/diabook-aerith/photo_view.tpl +++ b/view/theme/diabook-aerith/photo_view.tpl diff --git a/view/theme/diabook-aerith/profile_vcard.tpl b/view/theme/diabook-aerith/profile_vcard.tpl index e28ec2909..6fcffcc9b 100644 --- a/view/theme/diabook-aerith/profile_vcard.tpl +++ b/view/theme/diabook-aerith/profile_vcard.tpl @@ -22,7 +22,7 @@ - <div id="profile-photo-wrapper"><img class="photo" width="155" height="155" src="$profile.photo?rev=$profile.picdate" alt="$profile.name" /></div> + <div id="profile-photo-wrapper"><img class="photo" src="$profile.photo?rev=$profile.picdate" alt="$profile.name" /></div> {{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }} diff --git a/view/theme/diabook-aerith/rs_common_tabs.tpl b/view/theme/diabook-aerith/rs_common_tabs.tpl index 6a1c5c71b..6a1c5c71b 100644..100755 --- a/view/theme/diabook-aerith/rs_common_tabs.tpl +++ b/view/theme/diabook-aerith/rs_common_tabs.tpl diff --git a/view/theme/diabook-aerith/search_item.tpl b/view/theme/diabook-aerith/search_item.tpl index 123834064..123834064 100644..100755 --- a/view/theme/diabook-aerith/search_item.tpl +++ b/view/theme/diabook-aerith/search_item.tpl diff --git a/view/theme/diabook-aerith/style-network.css b/view/theme/diabook-aerith/style-network.css index 6e3b3f822..9925a90aa 100644 --- a/view/theme/diabook-aerith/style-network.css +++ b/view/theme/diabook-aerith/style-network.css @@ -2093,9 +2093,10 @@ ul.tabs li .active { /* photo */ .photo { box-shadow: 2px 2px 5px 0px #000000; -margin: 2px 5px 2px 5px; -max-height: 85%; -max-width: 85%; +margin: 0px; +border-radius: 10px; +height: 145px !important; +width: 145px !important; } .lframe { float: left; diff --git a/view/theme/diabook-aerith/style-profile.css b/view/theme/diabook-aerith/style-profile.css index f41c4a98a..19fea9a83 100644 --- a/view/theme/diabook-aerith/style-profile.css +++ b/view/theme/diabook-aerith/style-profile.css @@ -2082,10 +2082,10 @@ ul.tabs li .active { /* photo */ .photo { box-shadow: 2px 2px 5px 0px #000000; -margin: 2px 5px 2px 5px; -max-height: 85%; -max-width: 85%; +margin: 0px; border-radius: 10px; +height: 145px !important; +width: 145px !important; } .lframe { float: left; diff --git a/view/theme/diabook-aerith/style.css b/view/theme/diabook-aerith/style.css index 3d53115df..f7bdaeef6 100644 --- a/view/theme/diabook-aerith/style.css +++ b/view/theme/diabook-aerith/style.css @@ -447,6 +447,24 @@ a:hover { /*color: #005c94; */ text-decoration: underline; } +.intro-end { + border-bottom: 1px solid black; + clear: both; + margin-bottom: 25px; + padding-bottom: 25px; + width: 75%; + } +.intro-form-end { + clear: both; + } +.intro-fullname { + padding-bottom: 5px; + padding-top: 5px; + } +.intro-wrapper-end { + clear: both; + padding-bottom: 5px; + } code { font-family: Courier, monospace; white-space: pre; @@ -2111,10 +2129,10 @@ height: 350px; /* photo */ .photo { box-shadow: 2px 2px 5px 0px #000000; -margin: 2px 5px 2px 5px; -max-height: 85%; -max-width: 85%; +margin: 0px; border-radius: 10px; +height: 145px !important; +width: 145px !important; } .lframe { float: left; diff --git a/view/theme/diabook-aerith/theme.php b/view/theme/diabook-aerith/theme.php index e56f0ab74..b48f061fd 100644..100755 --- a/view/theme/diabook-aerith/theme.php +++ b/view/theme/diabook-aerith/theme.php @@ -3,7 +3,7 @@ /* * Name: Diabook-aerith * Description: Diabook-aerith : report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu - * Version: (Version: 1.012) + * Version: (Version: 1.013) * Author: */ diff --git a/view/theme/diabook-blue/communityhome.tpl b/view/theme/diabook-blue/communityhome.tpl index 6e126827b..6e126827b 100644..100755 --- a/view/theme/diabook-blue/communityhome.tpl +++ b/view/theme/diabook-blue/communityhome.tpl diff --git a/view/theme/diabook-blue/contact_template.tpl b/view/theme/diabook-blue/contact_template.tpl index 48930b48a..48930b48a 100644..100755 --- a/view/theme/diabook-blue/contact_template.tpl +++ b/view/theme/diabook-blue/contact_template.tpl diff --git a/view/theme/diabook-blue/directory_item.tpl b/view/theme/diabook-blue/directory_item.tpl index db1936e4b..db1936e4b 100644..100755 --- a/view/theme/diabook-blue/directory_item.tpl +++ b/view/theme/diabook-blue/directory_item.tpl diff --git a/view/theme/diabook-blue/fpostit/fpostit.js b/view/theme/diabook-blue/fpostit/fpostit.js index d183c7573..d183c7573 100644..100755 --- a/view/theme/diabook-blue/fpostit/fpostit.js +++ b/view/theme/diabook-blue/fpostit/fpostit.js diff --git a/view/theme/diabook-blue/group_side.tpl b/view/theme/diabook-blue/group_side.tpl index af183d04d..af183d04d 100644..100755 --- a/view/theme/diabook-blue/group_side.tpl +++ b/view/theme/diabook-blue/group_side.tpl diff --git a/view/theme/diabook-blue/icons/attach.png b/view/theme/diabook-blue/icons/attach.png Binary files differindex 1958041cf..1958041cf 100644..100755 --- a/view/theme/diabook-blue/icons/attach.png +++ b/view/theme/diabook-blue/icons/attach.png diff --git a/view/theme/diabook-blue/icons/audio.png b/view/theme/diabook-blue/icons/audio.png Binary files differindex 8d779a409..8d779a409 100644..100755 --- a/view/theme/diabook-blue/icons/audio.png +++ b/view/theme/diabook-blue/icons/audio.png diff --git a/view/theme/diabook-blue/icons/camera.png b/view/theme/diabook-blue/icons/camera.png Binary files differindex a5c7f1236..a5c7f1236 100644..100755 --- a/view/theme/diabook-blue/icons/camera.png +++ b/view/theme/diabook-blue/icons/camera.png diff --git a/view/theme/diabook-blue/icons/close_box.png b/view/theme/diabook-blue/icons/close_box.png Binary files differindex 28e2675b8..28e2675b8 100644..100755 --- a/view/theme/diabook-blue/icons/close_box.png +++ b/view/theme/diabook-blue/icons/close_box.png diff --git a/view/theme/diabook-blue/icons/contacts2.png b/view/theme/diabook-blue/icons/contacts2.png Binary files differindex 7817279f4..7817279f4 100644..100755 --- a/view/theme/diabook-blue/icons/contacts2.png +++ b/view/theme/diabook-blue/icons/contacts2.png diff --git a/view/theme/diabook-blue/icons/drop.png b/view/theme/diabook-blue/icons/drop.png Binary files differindex 2abb82ef2..2abb82ef2 100644..100755 --- a/view/theme/diabook-blue/icons/drop.png +++ b/view/theme/diabook-blue/icons/drop.png diff --git a/view/theme/diabook-blue/icons/file_as.png b/view/theme/diabook-blue/icons/file_as.png Binary files differindex 16713fa53..16713fa53 100644..100755 --- a/view/theme/diabook-blue/icons/file_as.png +++ b/view/theme/diabook-blue/icons/file_as.png diff --git a/view/theme/diabook-blue/icons/link.png b/view/theme/diabook-blue/icons/link.png Binary files differindex 0ef666a67..0ef666a67 100644..100755 --- a/view/theme/diabook-blue/icons/link.png +++ b/view/theme/diabook-blue/icons/link.png diff --git a/view/theme/diabook-blue/icons/lock.png b/view/theme/diabook-blue/icons/lock.png Binary files differindex 7e34bf279..7e34bf279 100644..100755 --- a/view/theme/diabook-blue/icons/lock.png +++ b/view/theme/diabook-blue/icons/lock.png diff --git a/view/theme/diabook-blue/icons/lupe.png b/view/theme/diabook-blue/icons/lupe.png Binary files differindex f8b228347..f8b228347 100644..100755 --- a/view/theme/diabook-blue/icons/lupe.png +++ b/view/theme/diabook-blue/icons/lupe.png diff --git a/view/theme/diabook-blue/icons/messages.png b/view/theme/diabook-blue/icons/messages.png Binary files differindex f7010c98c..f7010c98c 100644..100755 --- a/view/theme/diabook-blue/icons/messages.png +++ b/view/theme/diabook-blue/icons/messages.png diff --git a/view/theme/diabook-blue/icons/next.png b/view/theme/diabook-blue/icons/next.png Binary files differindex 7b5e25b90..7b5e25b90 100644..100755 --- a/view/theme/diabook-blue/icons/next.png +++ b/view/theme/diabook-blue/icons/next.png diff --git a/view/theme/diabook-blue/icons/notifications.png b/view/theme/diabook-blue/icons/notifications.png Binary files differindex c23673dbd..c23673dbd 100644..100755 --- a/view/theme/diabook-blue/icons/notifications.png +++ b/view/theme/diabook-blue/icons/notifications.png diff --git a/view/theme/diabook-blue/icons/notify.png b/view/theme/diabook-blue/icons/notify.png Binary files differindex 8a7bdc38f..8a7bdc38f 100644..100755 --- a/view/theme/diabook-blue/icons/notify.png +++ b/view/theme/diabook-blue/icons/notify.png diff --git a/view/theme/diabook-blue/icons/pencil.png b/view/theme/diabook-blue/icons/pencil.png Binary files differindex 772e49b17..772e49b17 100644..100755 --- a/view/theme/diabook-blue/icons/pencil.png +++ b/view/theme/diabook-blue/icons/pencil.png diff --git a/view/theme/diabook-blue/icons/prev.png b/view/theme/diabook-blue/icons/prev.png Binary files differindex 55c1464ba..55c1464ba 100644..100755 --- a/view/theme/diabook-blue/icons/prev.png +++ b/view/theme/diabook-blue/icons/prev.png diff --git a/view/theme/diabook-blue/icons/recycle.png b/view/theme/diabook-blue/icons/recycle.png Binary files differindex c3b8d2bf4..c3b8d2bf4 100644..100755 --- a/view/theme/diabook-blue/icons/recycle.png +++ b/view/theme/diabook-blue/icons/recycle.png diff --git a/view/theme/diabook-blue/icons/remote.png b/view/theme/diabook-blue/icons/remote.png Binary files differindex a560cc55e..a560cc55e 100644..100755 --- a/view/theme/diabook-blue/icons/remote.png +++ b/view/theme/diabook-blue/icons/remote.png diff --git a/view/theme/diabook-blue/icons/scroll_top.png b/view/theme/diabook-blue/icons/scroll_top.png Binary files differindex 0e7f7ae6a..0e7f7ae6a 100644..100755 --- a/view/theme/diabook-blue/icons/scroll_top.png +++ b/view/theme/diabook-blue/icons/scroll_top.png diff --git a/view/theme/diabook-blue/icons/selected.png b/view/theme/diabook-blue/icons/selected.png Binary files differindex 2a30ae252..2a30ae252 100644..100755 --- a/view/theme/diabook-blue/icons/selected.png +++ b/view/theme/diabook-blue/icons/selected.png diff --git a/view/theme/diabook-blue/icons/star.png b/view/theme/diabook-blue/icons/star.png Binary files differindex 0b00cb189..0b00cb189 100644..100755 --- a/view/theme/diabook-blue/icons/star.png +++ b/view/theme/diabook-blue/icons/star.png diff --git a/view/theme/diabook-blue/icons/starred.png b/view/theme/diabook-blue/icons/starred.png Binary files differindex 2b82dfca3..2b82dfca3 100644..100755 --- a/view/theme/diabook-blue/icons/starred.png +++ b/view/theme/diabook-blue/icons/starred.png diff --git a/view/theme/diabook-blue/icons/tagged.png b/view/theme/diabook-blue/icons/tagged.png Binary files differindex 144649ef8..144649ef8 100644..100755 --- a/view/theme/diabook-blue/icons/tagged.png +++ b/view/theme/diabook-blue/icons/tagged.png diff --git a/view/theme/diabook-blue/icons/unlock.png b/view/theme/diabook-blue/icons/unlock.png Binary files differindex a0cda0ae5..a0cda0ae5 100644..100755 --- a/view/theme/diabook-blue/icons/unlock.png +++ b/view/theme/diabook-blue/icons/unlock.png diff --git a/view/theme/diabook-blue/icons/unstarred.png b/view/theme/diabook-blue/icons/unstarred.png Binary files differindex ba3183f5c..ba3183f5c 100644..100755 --- a/view/theme/diabook-blue/icons/unstarred.png +++ b/view/theme/diabook-blue/icons/unstarred.png diff --git a/view/theme/diabook-blue/icons/video.png b/view/theme/diabook-blue/icons/video.png Binary files differindex a03d1d818..a03d1d818 100644..100755 --- a/view/theme/diabook-blue/icons/video.png +++ b/view/theme/diabook-blue/icons/video.png diff --git a/view/theme/diabook-blue/icons/weblink.png b/view/theme/diabook-blue/icons/weblink.png Binary files differindex 216e78344..216e78344 100644..100755 --- a/view/theme/diabook-blue/icons/weblink.png +++ b/view/theme/diabook-blue/icons/weblink.png diff --git a/view/theme/diabook-blue/jot.tpl b/view/theme/diabook-blue/jot.tpl index bd43994b5..bd43994b5 100644..100755 --- a/view/theme/diabook-blue/jot.tpl +++ b/view/theme/diabook-blue/jot.tpl diff --git a/view/theme/diabook-blue/mail_conv.tpl b/view/theme/diabook-blue/mail_conv.tpl index 989f17878..989f17878 100644..100755 --- a/view/theme/diabook-blue/mail_conv.tpl +++ b/view/theme/diabook-blue/mail_conv.tpl diff --git a/view/theme/diabook-blue/nav.tpl b/view/theme/diabook-blue/nav.tpl index 3b78b5995..fd29d9309 100644 --- a/view/theme/diabook-blue/nav.tpl +++ b/view/theme/diabook-blue/nav.tpl @@ -22,7 +22,7 @@ <span class="icon contacts">$nav.contacts.1</span> <span id="intro-update" class="nav-notify"></span></a> <ul id="nav-contacts-menu" class="menu-popup"> - <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-see-intro"><a href="$nav.notifications.0">$nav.introductions.1</a><span id="intro-update-li" class="nav-notify"></span></li> <li id="nav-contacts-all"><a href="contacts">$nav.contacts.1</a></li> </ul> </li> @@ -35,7 +35,7 @@ <span id="mail-update" class="nav-notify"></span></a> <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-see-all"><a href="$nav.messages.inbox.0">$nav.messages.inbox.1</a></li> + <li id="nav-messages-see-all"><a href="$nav.messages.inbox.0">$nav.messages.inbox.1</a><span id="mail-update-li" class="nav-notify"></span></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> diff --git a/view/theme/diabook-blue/photo_view.tpl b/view/theme/diabook-blue/photo_view.tpl index 20926656a..20926656a 100644..100755 --- a/view/theme/diabook-blue/photo_view.tpl +++ b/view/theme/diabook-blue/photo_view.tpl diff --git a/view/theme/diabook-blue/profile_vcard.tpl b/view/theme/diabook-blue/profile_vcard.tpl index e28ec2909..6fcffcc9b 100644 --- a/view/theme/diabook-blue/profile_vcard.tpl +++ b/view/theme/diabook-blue/profile_vcard.tpl @@ -22,7 +22,7 @@ - <div id="profile-photo-wrapper"><img class="photo" width="155" height="155" src="$profile.photo?rev=$profile.picdate" alt="$profile.name" /></div> + <div id="profile-photo-wrapper"><img class="photo" src="$profile.photo?rev=$profile.picdate" alt="$profile.name" /></div> {{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }} diff --git a/view/theme/diabook-blue/rs_common_tabs.tpl b/view/theme/diabook-blue/rs_common_tabs.tpl index 6a1c5c71b..6a1c5c71b 100644..100755 --- a/view/theme/diabook-blue/rs_common_tabs.tpl +++ b/view/theme/diabook-blue/rs_common_tabs.tpl diff --git a/view/theme/diabook-blue/search_item.tpl b/view/theme/diabook-blue/search_item.tpl index 123834064..123834064 100644..100755 --- a/view/theme/diabook-blue/search_item.tpl +++ b/view/theme/diabook-blue/search_item.tpl diff --git a/view/theme/diabook-blue/style-network.css b/view/theme/diabook-blue/style-network.css index 991b19849..48096f752 100644 --- a/view/theme/diabook-blue/style-network.css +++ b/view/theme/diabook-blue/style-network.css @@ -2054,9 +2054,10 @@ ul.tabs li .active { /* photo */ .photo { box-shadow: 2px 2px 5px 0px #000000; -margin: 2px 5px 2px 5px; -max-height: 85%; -max-width: 85%; +margin: 0px; +border-radius: 10px; +height: 145px !important; +width: 145px !important; } .lframe { float: left; diff --git a/view/theme/diabook-blue/style-profile.css b/view/theme/diabook-blue/style-profile.css index fca29d088..2c1fb0512 100644 --- a/view/theme/diabook-blue/style-profile.css +++ b/view/theme/diabook-blue/style-profile.css @@ -2049,10 +2049,10 @@ ul.tabs li .active { /* photo */ .photo { box-shadow: 2px 2px 5px 0px #000000; -margin: 2px 5px 2px 5px; -max-height: 85%; -max-width: 85%; +margin: 0px; border-radius: 10px; +height: 145px !important; +width: 145px !important; } .lframe { float: left; diff --git a/view/theme/diabook-blue/style.css b/view/theme/diabook-blue/style.css index 8a05fc4c4..83fd0c47f 100644 --- a/view/theme/diabook-blue/style.css +++ b/view/theme/diabook-blue/style.css @@ -447,6 +447,24 @@ a:hover { /*color: #005c94; */ text-decoration: underline; } +.intro-end { + border-bottom: 1px solid black; + clear: both; + margin-bottom: 25px; + padding-bottom: 25px; + width: 75%; + } +.intro-form-end { + clear: both; + } +.intro-fullname { + padding-bottom: 5px; + padding-top: 5px; + } +.intro-wrapper-end { + clear: both; + padding-bottom: 5px; + } code { font-family: Courier, monospace; white-space: pre; @@ -2067,10 +2085,10 @@ height: 350px; /* photo */ .photo { box-shadow: 2px 2px 5px 0px #000000; -margin: 2px 5px 2px 5px; -max-height: 85%; -max-width: 85%; +margin: 0px; border-radius: 10px; +height: 145px !important; +width: 145px !important; } .lframe { float: left; diff --git a/view/theme/diabook-blue/theme.php b/view/theme/diabook-blue/theme.php index 2e7aca92a..c64e9cd37 100644..100755 --- a/view/theme/diabook-blue/theme.php +++ b/view/theme/diabook-blue/theme.php @@ -3,7 +3,7 @@ /* * Name: Diabook-blue * Description: Diabook-blue: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu - * Version: (Version: 1.012) + * Version: (Version: 1.013) * Author: */ diff --git a/view/theme/diabook-red/communityhome.tpl b/view/theme/diabook-red/communityhome.tpl index c47bfbda5..c47bfbda5 100644..100755 --- a/view/theme/diabook-red/communityhome.tpl +++ b/view/theme/diabook-red/communityhome.tpl diff --git a/view/theme/diabook-red/contact_template.tpl b/view/theme/diabook-red/contact_template.tpl index 48930b48a..48930b48a 100644..100755 --- a/view/theme/diabook-red/contact_template.tpl +++ b/view/theme/diabook-red/contact_template.tpl diff --git a/view/theme/diabook-red/directory_item.tpl b/view/theme/diabook-red/directory_item.tpl index db1936e4b..db1936e4b 100644..100755 --- a/view/theme/diabook-red/directory_item.tpl +++ b/view/theme/diabook-red/directory_item.tpl diff --git a/view/theme/diabook-red/fpostit/fpostit.js b/view/theme/diabook-red/fpostit/fpostit.js index d183c7573..d183c7573 100644..100755 --- a/view/theme/diabook-red/fpostit/fpostit.js +++ b/view/theme/diabook-red/fpostit/fpostit.js diff --git a/view/theme/diabook-red/group_side.tpl b/view/theme/diabook-red/group_side.tpl index af183d04d..af183d04d 100644..100755 --- a/view/theme/diabook-red/group_side.tpl +++ b/view/theme/diabook-red/group_side.tpl diff --git a/view/theme/diabook-red/icons/attach.png b/view/theme/diabook-red/icons/attach.png Binary files differindex 1958041cf..1958041cf 100644..100755 --- a/view/theme/diabook-red/icons/attach.png +++ b/view/theme/diabook-red/icons/attach.png diff --git a/view/theme/diabook-red/icons/audio.png b/view/theme/diabook-red/icons/audio.png Binary files differindex 8d779a409..8d779a409 100644..100755 --- a/view/theme/diabook-red/icons/audio.png +++ b/view/theme/diabook-red/icons/audio.png diff --git a/view/theme/diabook-red/icons/camera.png b/view/theme/diabook-red/icons/camera.png Binary files differindex a5c7f1236..a5c7f1236 100644..100755 --- a/view/theme/diabook-red/icons/camera.png +++ b/view/theme/diabook-red/icons/camera.png diff --git a/view/theme/diabook-red/icons/close_box.png b/view/theme/diabook-red/icons/close_box.png Binary files differindex 28e2675b8..28e2675b8 100644..100755 --- a/view/theme/diabook-red/icons/close_box.png +++ b/view/theme/diabook-red/icons/close_box.png diff --git a/view/theme/diabook-red/icons/contacts.png b/view/theme/diabook-red/icons/contacts.png Binary files differindex 20c990c84..20c990c84 100644..100755 --- a/view/theme/diabook-red/icons/contacts.png +++ b/view/theme/diabook-red/icons/contacts.png diff --git a/view/theme/diabook-red/icons/contacts2.png b/view/theme/diabook-red/icons/contacts2.png Binary files differindex 7817279f4..7817279f4 100644..100755 --- a/view/theme/diabook-red/icons/contacts2.png +++ b/view/theme/diabook-red/icons/contacts2.png diff --git a/view/theme/diabook-red/icons/drop.png b/view/theme/diabook-red/icons/drop.png Binary files differindex 2abb82ef2..2abb82ef2 100644..100755 --- a/view/theme/diabook-red/icons/drop.png +++ b/view/theme/diabook-red/icons/drop.png diff --git a/view/theme/diabook-red/icons/file_as.png b/view/theme/diabook-red/icons/file_as.png Binary files differindex 16713fa53..16713fa53 100644..100755 --- a/view/theme/diabook-red/icons/file_as.png +++ b/view/theme/diabook-red/icons/file_as.png diff --git a/view/theme/diabook-red/icons/link.png b/view/theme/diabook-red/icons/link.png Binary files differindex 0ef666a67..0ef666a67 100644..100755 --- a/view/theme/diabook-red/icons/link.png +++ b/view/theme/diabook-red/icons/link.png diff --git a/view/theme/diabook-red/icons/lock.png b/view/theme/diabook-red/icons/lock.png Binary files differindex 7e34bf279..7e34bf279 100644..100755 --- a/view/theme/diabook-red/icons/lock.png +++ b/view/theme/diabook-red/icons/lock.png diff --git a/view/theme/diabook-red/icons/lupe.png b/view/theme/diabook-red/icons/lupe.png Binary files differindex f8b228347..f8b228347 100644..100755 --- a/view/theme/diabook-red/icons/lupe.png +++ b/view/theme/diabook-red/icons/lupe.png diff --git a/view/theme/diabook-red/icons/next.png b/view/theme/diabook-red/icons/next.png Binary files differindex 7b5e25b90..7b5e25b90 100644..100755 --- a/view/theme/diabook-red/icons/next.png +++ b/view/theme/diabook-red/icons/next.png diff --git a/view/theme/diabook-red/icons/notifications.png b/view/theme/diabook-red/icons/notifications.png Binary files differindex 97e5c311c..97e5c311c 100644..100755 --- a/view/theme/diabook-red/icons/notifications.png +++ b/view/theme/diabook-red/icons/notifications.png diff --git a/view/theme/diabook-red/icons/pencil.png b/view/theme/diabook-red/icons/pencil.png Binary files differindex 772e49b17..772e49b17 100644..100755 --- a/view/theme/diabook-red/icons/pencil.png +++ b/view/theme/diabook-red/icons/pencil.png diff --git a/view/theme/diabook-red/icons/photo-menu.jpg b/view/theme/diabook-red/icons/photo-menu.jpg Binary files differindex fde5eb535..fde5eb535 100644..100755 --- a/view/theme/diabook-red/icons/photo-menu.jpg +++ b/view/theme/diabook-red/icons/photo-menu.jpg diff --git a/view/theme/diabook-red/icons/prev.png b/view/theme/diabook-red/icons/prev.png Binary files differindex 55c1464ba..55c1464ba 100644..100755 --- a/view/theme/diabook-red/icons/prev.png +++ b/view/theme/diabook-red/icons/prev.png diff --git a/view/theme/diabook-red/icons/recycle.png b/view/theme/diabook-red/icons/recycle.png Binary files differindex c3b8d2bf4..c3b8d2bf4 100644..100755 --- a/view/theme/diabook-red/icons/recycle.png +++ b/view/theme/diabook-red/icons/recycle.png diff --git a/view/theme/diabook-red/icons/remote.png b/view/theme/diabook-red/icons/remote.png Binary files differindex a560cc55e..a560cc55e 100644..100755 --- a/view/theme/diabook-red/icons/remote.png +++ b/view/theme/diabook-red/icons/remote.png diff --git a/view/theme/diabook-red/icons/scroll_top.png b/view/theme/diabook-red/icons/scroll_top.png Binary files differindex 0e7f7ae6a..0e7f7ae6a 100644..100755 --- a/view/theme/diabook-red/icons/scroll_top.png +++ b/view/theme/diabook-red/icons/scroll_top.png diff --git a/view/theme/diabook-red/icons/selected.png b/view/theme/diabook-red/icons/selected.png Binary files differindex 2a30ae252..2a30ae252 100644..100755 --- a/view/theme/diabook-red/icons/selected.png +++ b/view/theme/diabook-red/icons/selected.png diff --git a/view/theme/diabook-red/icons/star.png b/view/theme/diabook-red/icons/star.png Binary files differindex 0b00cb189..0b00cb189 100644..100755 --- a/view/theme/diabook-red/icons/star.png +++ b/view/theme/diabook-red/icons/star.png diff --git a/view/theme/diabook-red/icons/starred.png b/view/theme/diabook-red/icons/starred.png Binary files differindex 2b82dfca3..2b82dfca3 100644..100755 --- a/view/theme/diabook-red/icons/starred.png +++ b/view/theme/diabook-red/icons/starred.png diff --git a/view/theme/diabook-red/icons/tagged.png b/view/theme/diabook-red/icons/tagged.png Binary files differindex 144649ef8..144649ef8 100644..100755 --- a/view/theme/diabook-red/icons/tagged.png +++ b/view/theme/diabook-red/icons/tagged.png diff --git a/view/theme/diabook-red/icons/unlock.png b/view/theme/diabook-red/icons/unlock.png Binary files differindex a0cda0ae5..a0cda0ae5 100644..100755 --- a/view/theme/diabook-red/icons/unlock.png +++ b/view/theme/diabook-red/icons/unlock.png diff --git a/view/theme/diabook-red/icons/unstarred.png b/view/theme/diabook-red/icons/unstarred.png Binary files differindex ba3183f5c..ba3183f5c 100644..100755 --- a/view/theme/diabook-red/icons/unstarred.png +++ b/view/theme/diabook-red/icons/unstarred.png diff --git a/view/theme/diabook-red/icons/video.png b/view/theme/diabook-red/icons/video.png Binary files differindex a03d1d818..a03d1d818 100644..100755 --- a/view/theme/diabook-red/icons/video.png +++ b/view/theme/diabook-red/icons/video.png diff --git a/view/theme/diabook-red/icons/weblink.png b/view/theme/diabook-red/icons/weblink.png Binary files differindex 216e78344..216e78344 100644..100755 --- a/view/theme/diabook-red/icons/weblink.png +++ b/view/theme/diabook-red/icons/weblink.png diff --git a/view/theme/diabook-red/jot.tpl b/view/theme/diabook-red/jot.tpl index bd43994b5..bd43994b5 100644..100755 --- a/view/theme/diabook-red/jot.tpl +++ b/view/theme/diabook-red/jot.tpl diff --git a/view/theme/diabook-red/mail_conv.tpl b/view/theme/diabook-red/mail_conv.tpl index 989f17878..989f17878 100644..100755 --- a/view/theme/diabook-red/mail_conv.tpl +++ b/view/theme/diabook-red/mail_conv.tpl diff --git a/view/theme/diabook-red/nav.tpl b/view/theme/diabook-red/nav.tpl index fdf748cb2..dc3fd0cde 100644 --- a/view/theme/diabook-red/nav.tpl +++ b/view/theme/diabook-red/nav.tpl @@ -22,7 +22,7 @@ <span class="icon contacts">$nav.contacts.1</span> <span id="intro-update" class="nav-notify"></span></a> <ul id="nav-contacts-menu" class="menu-popup"> - <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-see-intro"><a href="$nav.notifications.0">$nav.introductions.1</a><span id="intro-update-li" class="nav-notify"></span></li> <li id="nav-contacts-all"><a href="contacts">$nav.contacts.1</a></li> </ul> </li> @@ -35,7 +35,7 @@ <span id="mail-update" class="nav-notify"></span></a> <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-see-all"><a href="$nav.messages.inbox.0">$nav.messages.inbox.1</a></li> + <li id="nav-messages-see-all"><a href="$nav.messages.inbox.0">$nav.messages.inbox.1</a><span id="mail-update-li" class="nav-notify"></span></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> diff --git a/view/theme/diabook-red/photo_view.tpl b/view/theme/diabook-red/photo_view.tpl index 511fc73ac..511fc73ac 100644..100755 --- a/view/theme/diabook-red/photo_view.tpl +++ b/view/theme/diabook-red/photo_view.tpl diff --git a/view/theme/diabook-red/rs_common_tabs.tpl b/view/theme/diabook-red/rs_common_tabs.tpl index 6a1c5c71b..6a1c5c71b 100644..100755 --- a/view/theme/diabook-red/rs_common_tabs.tpl +++ b/view/theme/diabook-red/rs_common_tabs.tpl diff --git a/view/theme/diabook-red/search_item.tpl b/view/theme/diabook-red/search_item.tpl index 123834064..123834064 100644..100755 --- a/view/theme/diabook-red/search_item.tpl +++ b/view/theme/diabook-red/search_item.tpl diff --git a/view/theme/diabook-red/style-network.css b/view/theme/diabook-red/style-network.css index 863ad87ad..5cec59c87 100644 --- a/view/theme/diabook-red/style-network.css +++ b/view/theme/diabook-red/style-network.css @@ -529,6 +529,7 @@ background-image: -o-linear-gradient(bottom, rgb(173,59,10) 0%, rgb(255,79,15) 6 background-image: -moz-linear-gradient(bottom, rgb(173,59,10) 0%, rgb(255,79,15) 65%); background-image: -webkit-linear-gradient(bottom, rgb(173,59,10) 0%, rgb(255,79,15) 65%); background-image: -ms-linear-gradient(bottom, rgb(173,59,10) 0%, rgb(255,79,15) 65%); +filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ad3b0a', endColorstr='#ff4f0f'); background-image: -webkit-gradient( linear, @@ -2090,9 +2091,10 @@ ul.tabs li .active { /* photo */ .photo { box-shadow: 2px 2px 5px 0px #000000; -margin: 2px 5px 2px 5px; -max-height: 85%; -max-width: 85%; +margin: 0px; +border-radius: 10px; +height: 145px !important; +width: 145px !important; } .lframe { float: left; diff --git a/view/theme/diabook-red/style-profile.css b/view/theme/diabook-red/style-profile.css index dcd0092c9..2568e93d7 100644 --- a/view/theme/diabook-red/style-profile.css +++ b/view/theme/diabook-red/style-profile.css @@ -2063,10 +2063,10 @@ ul.tabs li .active { /* photo */ .photo { box-shadow: 2px 2px 5px 0px #000000; -margin: 2px 5px 2px 5px; -max-height: 85%; -max-width: 85%; +margin: 0px; border-radius: 10px; +height: 145px !important; +width: 145px !important; } .lframe { float: left; diff --git a/view/theme/diabook-red/style.css b/view/theme/diabook-red/style.css index b1061f035..5475537bb 100644 --- a/view/theme/diabook-red/style.css +++ b/view/theme/diabook-red/style.css @@ -447,6 +447,24 @@ a:hover { /*color: #005c94; */ text-decoration: underline; } +.intro-end { + border-bottom: 1px solid black; + clear: both; + margin-bottom: 25px; + padding-bottom: 25px; + width: 75%; + } +.intro-form-end { + clear: both; + } +.intro-fullname { + padding-bottom: 5px; + padding-top: 5px; + } +.intro-wrapper-end { + clear: both; + padding-bottom: 5px; + } code { font-family: Courier, monospace; white-space: pre; @@ -2097,10 +2115,10 @@ height: 350px; /* photo */ .photo { box-shadow: 2px 2px 5px 0px #000000; -margin: 2px 5px 2px 5px; -max-height: 85%; -max-width: 85%; +margin: 0px; border-radius: 10px; +height: 145px !important; +width: 145px !important; } .lframe { float: left; diff --git a/view/theme/diabook-red/theme.php b/view/theme/diabook-red/theme.php index 0db9818e4..a0d5ead73 100644..100755 --- a/view/theme/diabook-red/theme.php +++ b/view/theme/diabook-red/theme.php @@ -3,7 +3,7 @@ /* * Name: Diabook-red * Description: Diabook-red: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu - * Version: (Version: 1.012) + * Version: (Version: 1.013) * Author: */ diff --git a/view/theme/diabook/communityhome.tpl b/view/theme/diabook/communityhome.tpl index 5c2164b50..5c2164b50 100644..100755 --- a/view/theme/diabook/communityhome.tpl +++ b/view/theme/diabook/communityhome.tpl diff --git a/view/theme/diabook/contact_template.tpl b/view/theme/diabook/contact_template.tpl index 48930b48a..48930b48a 100644..100755 --- a/view/theme/diabook/contact_template.tpl +++ b/view/theme/diabook/contact_template.tpl diff --git a/view/theme/diabook/directory_item.tpl b/view/theme/diabook/directory_item.tpl index db1936e4b..db1936e4b 100644..100755 --- a/view/theme/diabook/directory_item.tpl +++ b/view/theme/diabook/directory_item.tpl diff --git a/view/theme/diabook/fpostit/fpostit.js b/view/theme/diabook/fpostit/fpostit.js index d183c7573..d183c7573 100644..100755 --- a/view/theme/diabook/fpostit/fpostit.js +++ b/view/theme/diabook/fpostit/fpostit.js diff --git a/view/theme/diabook/group_side.tpl b/view/theme/diabook/group_side.tpl index af183d04d..af183d04d 100644..100755 --- a/view/theme/diabook/group_side.tpl +++ b/view/theme/diabook/group_side.tpl diff --git a/view/theme/diabook/icons/attach.png b/view/theme/diabook/icons/attach.png Binary files differindex 1958041cf..1958041cf 100644..100755 --- a/view/theme/diabook/icons/attach.png +++ b/view/theme/diabook/icons/attach.png diff --git a/view/theme/diabook/icons/audio.png b/view/theme/diabook/icons/audio.png Binary files differindex 8d779a409..8d779a409 100644..100755 --- a/view/theme/diabook/icons/audio.png +++ b/view/theme/diabook/icons/audio.png diff --git a/view/theme/diabook/icons/camera.png b/view/theme/diabook/icons/camera.png Binary files differindex a5c7f1236..a5c7f1236 100644..100755 --- a/view/theme/diabook/icons/camera.png +++ b/view/theme/diabook/icons/camera.png diff --git a/view/theme/diabook/icons/close_box.png b/view/theme/diabook/icons/close_box.png Binary files differindex 28e2675b8..28e2675b8 100644..100755 --- a/view/theme/diabook/icons/close_box.png +++ b/view/theme/diabook/icons/close_box.png diff --git a/view/theme/diabook/icons/contacts2.png b/view/theme/diabook/icons/contacts2.png Binary files differindex 7817279f4..7817279f4 100644..100755 --- a/view/theme/diabook/icons/contacts2.png +++ b/view/theme/diabook/icons/contacts2.png diff --git a/view/theme/diabook/icons/drop.png b/view/theme/diabook/icons/drop.png Binary files differindex 2abb82ef2..2abb82ef2 100644..100755 --- a/view/theme/diabook/icons/drop.png +++ b/view/theme/diabook/icons/drop.png diff --git a/view/theme/diabook/icons/expand.png b/view/theme/diabook/icons/expand.png Binary files differindex a46e88ea5..a46e88ea5 100644..100755 --- a/view/theme/diabook/icons/expand.png +++ b/view/theme/diabook/icons/expand.png diff --git a/view/theme/diabook/icons/file_as.png b/view/theme/diabook/icons/file_as.png Binary files differindex 16713fa53..16713fa53 100644..100755 --- a/view/theme/diabook/icons/file_as.png +++ b/view/theme/diabook/icons/file_as.png diff --git a/view/theme/diabook/icons/link.png b/view/theme/diabook/icons/link.png Binary files differindex 0ef666a67..0ef666a67 100644..100755 --- a/view/theme/diabook/icons/link.png +++ b/view/theme/diabook/icons/link.png diff --git a/view/theme/diabook/icons/lock.png b/view/theme/diabook/icons/lock.png Binary files differindex 7e34bf279..7e34bf279 100644..100755 --- a/view/theme/diabook/icons/lock.png +++ b/view/theme/diabook/icons/lock.png diff --git a/view/theme/diabook/icons/lupe.png b/view/theme/diabook/icons/lupe.png Binary files differindex f8b228347..f8b228347 100644..100755 --- a/view/theme/diabook/icons/lupe.png +++ b/view/theme/diabook/icons/lupe.png diff --git a/view/theme/diabook/icons/messages.png b/view/theme/diabook/icons/messages.png Binary files differindex 38e11ef88..38e11ef88 100644..100755 --- a/view/theme/diabook/icons/messages.png +++ b/view/theme/diabook/icons/messages.png diff --git a/view/theme/diabook/icons/next.png b/view/theme/diabook/icons/next.png Binary files differindex 7b5e25b90..7b5e25b90 100644..100755 --- a/view/theme/diabook/icons/next.png +++ b/view/theme/diabook/icons/next.png diff --git a/view/theme/diabook/icons/notifications.png b/view/theme/diabook/icons/notifications.png Binary files differindex 270997740..270997740 100644..100755 --- a/view/theme/diabook/icons/notifications.png +++ b/view/theme/diabook/icons/notifications.png diff --git a/view/theme/diabook/icons/notify.png b/view/theme/diabook/icons/notify.png Binary files differindex 9b852d05b..9b852d05b 100644..100755 --- a/view/theme/diabook/icons/notify.png +++ b/view/theme/diabook/icons/notify.png diff --git a/view/theme/diabook/icons/pencil.png b/view/theme/diabook/icons/pencil.png Binary files differindex 772e49b17..772e49b17 100644..100755 --- a/view/theme/diabook/icons/pencil.png +++ b/view/theme/diabook/icons/pencil.png diff --git a/view/theme/diabook/icons/prev.png b/view/theme/diabook/icons/prev.png Binary files differindex 55c1464ba..55c1464ba 100644..100755 --- a/view/theme/diabook/icons/prev.png +++ b/view/theme/diabook/icons/prev.png diff --git a/view/theme/diabook/icons/recycle.png b/view/theme/diabook/icons/recycle.png Binary files differindex c3b8d2bf4..c3b8d2bf4 100644..100755 --- a/view/theme/diabook/icons/recycle.png +++ b/view/theme/diabook/icons/recycle.png diff --git a/view/theme/diabook/icons/remote.png b/view/theme/diabook/icons/remote.png Binary files differindex a560cc55e..a560cc55e 100644..100755 --- a/view/theme/diabook/icons/remote.png +++ b/view/theme/diabook/icons/remote.png diff --git a/view/theme/diabook/icons/scroll_top.png b/view/theme/diabook/icons/scroll_top.png Binary files differindex 0e7f7ae6a..0e7f7ae6a 100644..100755 --- a/view/theme/diabook/icons/scroll_top.png +++ b/view/theme/diabook/icons/scroll_top.png diff --git a/view/theme/diabook/icons/selected.png b/view/theme/diabook/icons/selected.png Binary files differindex 2a30ae252..2a30ae252 100644..100755 --- a/view/theme/diabook/icons/selected.png +++ b/view/theme/diabook/icons/selected.png diff --git a/view/theme/diabook/icons/star.png b/view/theme/diabook/icons/star.png Binary files differindex 0b00cb189..0b00cb189 100644..100755 --- a/view/theme/diabook/icons/star.png +++ b/view/theme/diabook/icons/star.png diff --git a/view/theme/diabook/icons/starred.png b/view/theme/diabook/icons/starred.png Binary files differindex 2b82dfca3..2b82dfca3 100644..100755 --- a/view/theme/diabook/icons/starred.png +++ b/view/theme/diabook/icons/starred.png diff --git a/view/theme/diabook/icons/tagged.png b/view/theme/diabook/icons/tagged.png Binary files differindex 144649ef8..144649ef8 100644..100755 --- a/view/theme/diabook/icons/tagged.png +++ b/view/theme/diabook/icons/tagged.png diff --git a/view/theme/diabook/icons/unlock.png b/view/theme/diabook/icons/unlock.png Binary files differindex a0cda0ae5..a0cda0ae5 100644..100755 --- a/view/theme/diabook/icons/unlock.png +++ b/view/theme/diabook/icons/unlock.png diff --git a/view/theme/diabook/icons/unstarred.png b/view/theme/diabook/icons/unstarred.png Binary files differindex ba3183f5c..ba3183f5c 100644..100755 --- a/view/theme/diabook/icons/unstarred.png +++ b/view/theme/diabook/icons/unstarred.png diff --git a/view/theme/diabook/icons/video.png b/view/theme/diabook/icons/video.png Binary files differindex a03d1d818..a03d1d818 100644..100755 --- a/view/theme/diabook/icons/video.png +++ b/view/theme/diabook/icons/video.png diff --git a/view/theme/diabook/icons/weblink.png b/view/theme/diabook/icons/weblink.png Binary files differindex 216e78344..216e78344 100644..100755 --- a/view/theme/diabook/icons/weblink.png +++ b/view/theme/diabook/icons/weblink.png diff --git a/view/theme/diabook/jot.tpl b/view/theme/diabook/jot.tpl index bd43994b5..bd43994b5 100644..100755 --- a/view/theme/diabook/jot.tpl +++ b/view/theme/diabook/jot.tpl diff --git a/view/theme/diabook/mail_conv.tpl b/view/theme/diabook/mail_conv.tpl index 989f17878..989f17878 100644..100755 --- a/view/theme/diabook/mail_conv.tpl +++ b/view/theme/diabook/mail_conv.tpl diff --git a/view/theme/diabook/nav.tpl b/view/theme/diabook/nav.tpl index 78eb34197..522fb22b4 100644 --- a/view/theme/diabook/nav.tpl +++ b/view/theme/diabook/nav.tpl @@ -22,7 +22,7 @@ <span class="icon contacts">$nav.contacts.1</span> <span id="intro-update" class="nav-notify"></span></a> <ul id="nav-contacts-menu" class="menu-popup"> - <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-see-intro"><a href="$nav.notifications.0">$nav.introductions.1</a><span id="intro-update-li" class="nav-notify"></span></li> <li id="nav-contacts-all"><a href="contacts">$nav.contacts.1</a></li> </ul> </li> @@ -36,7 +36,7 @@ <span id="mail-update" class="nav-notify"></span></a> <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-see-all"><a href="$nav.messages.inbox.0">$nav.messages.inbox.1</a></li> + <li id="nav-messages-see-all"><a href="$nav.messages.inbox.0">$nav.messages.inbox.1</a><span id="mail-update-li" class="nav-notify"></span></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> diff --git a/view/theme/diabook/photo_view.tpl b/view/theme/diabook/photo_view.tpl index 511fc73ac..511fc73ac 100644..100755 --- a/view/theme/diabook/photo_view.tpl +++ b/view/theme/diabook/photo_view.tpl diff --git a/view/theme/diabook/profile_vcard.tpl b/view/theme/diabook/profile_vcard.tpl index e28ec2909..b982a2069 100644 --- a/view/theme/diabook/profile_vcard.tpl +++ b/view/theme/diabook/profile_vcard.tpl @@ -22,7 +22,7 @@ - <div id="profile-photo-wrapper"><img class="photo" width="155" height="155" src="$profile.photo?rev=$profile.picdate" alt="$profile.name" /></div> + <div id="profile-photo-wrapper"><img class="photo" src="$profile.photo?rev=$profile.picdate" alt="$profile.name" /></div> {{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }} diff --git a/view/theme/diabook/rs_common_tabs.tpl b/view/theme/diabook/rs_common_tabs.tpl index 6a1c5c71b..6a1c5c71b 100644..100755 --- a/view/theme/diabook/rs_common_tabs.tpl +++ b/view/theme/diabook/rs_common_tabs.tpl diff --git a/view/theme/diabook/search_item.tpl b/view/theme/diabook/search_item.tpl index 123834064..123834064 100644..100755 --- a/view/theme/diabook/search_item.tpl +++ b/view/theme/diabook/search_item.tpl diff --git a/view/theme/diabook/style-profile.css b/view/theme/diabook/style-profile.css index 5ac152252..5edfc73a3 100644 --- a/view/theme/diabook/style-profile.css +++ b/view/theme/diabook/style-profile.css @@ -2023,6 +2023,8 @@ ul.tabs li .active { /* photo */ .photo { border-radius: 10px; +height: 145px !important; +width: 145px !important; } .lframe { float: left; diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css index 5f60c0bff..90291d7b6 100644 --- a/view/theme/diabook/style.css +++ b/view/theme/diabook/style.css @@ -449,6 +449,24 @@ a:hover { /*color: #005c94; */ text-decoration: underline; } +.intro-end { + border-bottom: 1px solid black; + clear: both; + margin-bottom: 25px; + padding-bottom: 25px; + width: 75%; + } +.intro-form-end { + clear: both; + } +.intro-fullname { + padding-bottom: 5px; + padding-top: 5px; + } +.intro-wrapper-end { + clear: both; + padding-bottom: 5px; + } code { font-family: Courier, monospace; white-space: pre; @@ -2046,6 +2064,8 @@ height: 350px; /* photo */ .photo { border-radius: 10px; +height: 145px !important; +width: 145px !important; } .lframe { float: left; diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php index 50a7c6974..0c83a0567 100644..100755 --- a/view/theme/diabook/theme.php +++ b/view/theme/diabook/theme.php @@ -3,7 +3,7 @@ /* * Name: Diabook * Description: Diabook: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu - * Version: (Version: 1.012) + * Version: (Version: 1.013) * Author: */ @@ -339,9 +339,10 @@ if ($a->argv[0] === "settings"){ if (!is_null($cssFile)) $a->page['htmlhead'] .= sprintf('<link rel="stylesheet" type="text/css" href="%s" />', $cssFile); //load jquery.cookie.js -$cookieJS = $a->get_baseurl($ssl_state)."/view/theme/diabook-blue/js/jquery.cookie.js"; +$cookieJS = $a->get_baseurl($ssl_state)."/view/theme/diabook/js/jquery.cookie.js"; $a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $cookieJS); + //js scripts $a->page['htmlhead'] .= ' @@ -350,15 +351,9 @@ $a->page['htmlhead'] .= ' $(function() { $("a.lightbox").fancybox(); // Select all links with lightbox class }); - - $(document).ready(function (){ - $("iframe").each(function(){ - var url = $(this).attr("src"); - $(this).attr("src",url+"?wmode=transparent"); }); - }); - + </script>'; - + if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] or $a->argv[0] === "network" && local_user()){ $a->page['htmlhead'] .= ' |
