diff options
Diffstat (limited to 'view/theme/diabook')
-rw-r--r-- | view/theme/diabook/comment_item.tpl | 35 | ||||
-rwxr-xr-x | view/theme/diabook/experimental | 0 | ||||
-rwxr-xr-x | view/theme/diabook/group_side.tpl | 29 | ||||
-rw-r--r-- | view/theme/diabook/icons/isstar.png | bin | 1277 -> 0 bytes | |||
-rwxr-xr-x | view/theme/diabook/icons/next.png | bin | 0 -> 300 bytes | |||
-rwxr-xr-x | view/theme/diabook/icons/notifications.png | bin | 758 -> 714 bytes | |||
-rwxr-xr-x | view/theme/diabook/icons/prev.png | bin | 0 -> 336 bytes | |||
-rwxr-xr-x | view/theme/diabook/icons/starred.png | bin | 1617 -> 501 bytes | |||
-rwxr-xr-x | view/theme/diabook/icons/unglobe.png | bin | 798 -> 0 bytes | |||
-rw-r--r-- | view/theme/diabook/nav.tpl | 6 | ||||
-rwxr-xr-x | view/theme/diabook/photo_view.tpl | 27 | ||||
-rw-r--r-- | view/theme/diabook/profile_side.tpl | 19 | ||||
-rw-r--r-- | view/theme/diabook/style.css | 140 | ||||
-rwxr-xr-x | view/theme/diabook/theme.php | 120 | ||||
-rw-r--r-- | view/theme/diabook/wall_item.tpl | 4 | ||||
-rw-r--r-- | view/theme/diabook/wallwall_item.tpl | 4 |
16 files changed, 315 insertions, 69 deletions
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 @@ - <div class="comment-wwedit-wrapper" id="comment-edit-wrapper-$id" style="display: block;"> - <form class="comment-edit-form" id="comment-edit-form-$id" action="item" method="post" onsubmit="post_comment($id); return false;"> - <input type="hidden" name="type" value="$type" /> - <input type="hidden" name="profile_uid" value="$profile_uid" /> - <input type="hidden" name="parent" value="$parent" /> - <input type="hidden" name="return" value="$return_path" /> - <input type="hidden" name="jsreload" value="$jsreload" /> - <input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" /> - - <div class="comment-edit-photo" id="comment-edit-photo-$id" > - <a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a> - </div> - <div class="comment-edit-photo-end"></div> - <textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);" onBlur="commentClose(this,$id);" >$comment</textarea> - - {{ if $qcomment }} - <ul class="qcomment-wrapper"> - {{ for $qcomment as $qc }} - <li class="fakelink qcomment" - onclick="commentInsert(this,$id); return false;">$qc</li> - {{ endfor }} - </ul> - {{ endif }} - - <div class="comment-edit-text-end"></div> - <div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-$id" style="display: none;"> - <input type="submit" onclick="post_comment($id); return false;" id="comment-edit-submit-$id" class="comment-edit-submit" name="submit" value="$submit" /> - <span onclick="preview_comment($id);" id="comment-edit-preview-link-$id" class="fakelink">$preview</span> - <div id="comment-edit-preview-$id" class="comment-edit-preview" style="display:none;"></div> - </div> - - <div class="comment-edit-end"></div> - </form> - - </div> diff --git a/view/theme/diabook/experimental b/view/theme/diabook/experimental deleted file mode 100755 index e69de29bb..000000000 --- a/view/theme/diabook/experimental +++ /dev/null diff --git a/view/theme/diabook/group_side.tpl b/view/theme/diabook/group_side.tpl new file mode 100755 index 000000000..af183d04d --- /dev/null +++ b/view/theme/diabook/group_side.tpl @@ -0,0 +1,29 @@ +<div id="group-sidebar" class="widget"> + <div class="title tool"> + <h3 class="label">$title</h3> + <a href="group/new" title="$createtext" class="action"><span class="icon text s16 add"></span></a> + </div> + + <div id="sidebar-group-list"> + <ul> + {{ for $groups as $group }} + <li class="tool {{ if $group.selected }}selected{{ endif }}"> + <a href="$group.href" class="label"> + $group.text + </a> + {{ if $group.edit }} + <a href="$group.edit.href" class="action"><span class="icon text s10 edit"></span></a> + {{ endif }} + {{ if $group.cid }} + <input type="checkbox" + class="{{ if $group.selected }}ticked{{ else }}unticked {{ endif }} action" + onclick="contactgroupChangeMember('$group.id','$group.cid');return true;" + {{ if $group.ismember }}checked="checked"{{ endif }} + /> + {{ endif }} + </li> + {{ endfor }} + </ul> + </div> +</div> + diff --git a/view/theme/diabook/icons/isstar.png b/view/theme/diabook/icons/isstar.png Binary files differdeleted file mode 100644 index c955b25b5..000000000 --- a/view/theme/diabook/icons/isstar.png +++ /dev/null diff --git a/view/theme/diabook/icons/next.png b/view/theme/diabook/icons/next.png Binary files differnew file mode 100755 index 000000000..7b5e25b90 --- /dev/null +++ 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 5bdc34f76..270997740 100755 --- a/view/theme/diabook/icons/notifications.png +++ b/view/theme/diabook/icons/notifications.png diff --git a/view/theme/diabook/icons/prev.png b/view/theme/diabook/icons/prev.png Binary files differnew file mode 100755 index 000000000..55c1464ba --- /dev/null +++ b/view/theme/diabook/icons/prev.png diff --git a/view/theme/diabook/icons/starred.png b/view/theme/diabook/icons/starred.png Binary files differindex 72a49c157..2b82dfca3 100755 --- a/view/theme/diabook/icons/starred.png +++ b/view/theme/diabook/icons/starred.png diff --git a/view/theme/diabook/icons/unglobe.png b/view/theme/diabook/icons/unglobe.png Binary files differdeleted file mode 100755 index aa9b0e189..000000000 --- a/view/theme/diabook/icons/unglobe.png +++ /dev/null diff --git a/view/theme/diabook/nav.tpl b/view/theme/diabook/nav.tpl index a098ae8b7..8b32ebe6c 100644 --- a/view/theme/diabook/nav.tpl +++ b/view/theme/diabook/nav.tpl @@ -26,6 +26,7 @@ <li id="nav-contacts-all"><a href="contacts">$nav.contacts.1</a></li> </ul> </li> + {{ endif }} {{ if $nav.messages }} @@ -140,8 +141,9 @@ <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: 25px; left: 5px;"><a href="http://pad.toktan.org/p/diabook" target="blank" ><img src="view/theme/diabook/icons/bluebug.png" title="report bugs for the theme diabook"/></a></div> +<div style="position: fixed; bottom: 3px; left: 25px;">$langselector</div> +<div style="position: fixed; bottom: 23px; left: 5px;"><a href="http://pad.toktan.org/p/diabook" target="blank" ><img src="view/theme/diabook/icons/bluebug.png" title="report bugs for the theme diabook"/></a></div> + diff --git a/view/theme/diabook/photo_view.tpl b/view/theme/diabook/photo_view.tpl new file mode 100755 index 000000000..511fc73ac --- /dev/null +++ b/view/theme/diabook/photo_view.tpl @@ -0,0 +1,27 @@ +<div id="live-display"></div> +<h3><a href="$album.0">$album.1</a></h3> + +<div id="photo-edit-link-wrap"> +{{ if $tools }} +<a id="photo-edit-link" href="$tools.edit.0">$tools.edit.1</a> +- +<a id="photo-toprofile-link" href="$tools.profile.0">$tools.profile.1</a> +{{ endif }} +{{ if $lock }} - <img src="images/lock_icon.gif" class="lockview" alt="$lock" onclick="lockview(event,'photo$id');" /> {{ endif }} +</div> + +<div id="photo-photo"> + {{ if $prevlink }}<div id="photo-prev-link"><a href="$prevlink.0">$prevlink.1</a></div>{{ endif }} + <a href="$photo.href" class="lightbox" title="$photo.title"><img src="$photo.src" /></a> + {{ if $nextlink }}<div id="photo-next-link"><a href="$nextlink.0">$nextlink.1</a></div>{{ endif }} +</div> + +<div id="photo-photo-end"></div> +<div id="photo-caption" >$desc</div> +{{ if $tags }} +<div id="in-this-photo-text">$tags.0</div> +<div id="in-this-photo">$tags.1</div> +{{ endif }} +{{ if $tags.2 }}<div id="tag-remove"><a href="$tags.2">$tags.3</a></div>{{ endif }} + +{{ if $edit }}$edit{{ endif }}
\ No newline at end of file diff --git a/view/theme/diabook/profile_side.tpl b/view/theme/diabook/profile_side.tpl new file mode 100644 index 000000000..595684bf5 --- /dev/null +++ b/view/theme/diabook/profile_side.tpl @@ -0,0 +1,19 @@ +<div id="profile_side"> + <div id="ps-usernameicon"> + <a href="$ps.usermenu.status.0" title="$userinfo.name"> + <img src="$userinfo.icon" id="ps-usericon" alt="$userinfo.name"> + </a> + <a href="$ps.usermenu.status.0" id="ps-username" title="$userinfo.name">$userinfo.name</a> + </div> + +<ul id="profile-side-menu" class="menu-profile-side"> + <li id="profile-side-status" class="menu-profile-list"><a class="menu-profile-list-item" href="$ps.usermenu.status.0">$ps.usermenu.status.1</a></li> + <li id="profile-side-profile" class="menu-profile-list"><a class="menu-profile-list-item" href="$ps.usermenu.profile.0">$ps.usermenu.profile.1</a></li> + <li id="profile-side-photos" class="menu-profile-list"><a class="menu-profile-list-item" href="$ps.usermenu.photos.0">$ps.usermenu.photos.1</a></li> + <li id="profile-side-events" class="menu-profile-list"><a class="menu-profile-list-item" href="$ps.usermenu.events.0">$ps.usermenu.events.1</a></li> + <li id="profile-side-notes" class="menu-profile-list"><a class="menu-profile-list-item" href="$ps.usermenu.notes.0">$ps.usermenu.notes.1</a></li> +</ul> + +</div> + +
\ No newline at end of file diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css index bccfea149..df692cbc6 100644 --- a/view/theme/diabook/style.css +++ b/view/theme/diabook/style.css @@ -177,8 +177,8 @@ .icon.on { background-image: url("../../../view/theme/diabook/icons/toogle_on.png"); background-repeat: no-repeat;} .icon.off { background-image: url("../../../view/theme/diabook/icons/toogle_off.png"); background-repeat: no-repeat;} -.prev { background-position: -90px -60px;} -.next { background-position: -110px -60px;} +.icon.prev { background-image: url("../../../view/theme/diabook/icons/prev.png"); background-repeat: no-repeat;} +.icon.next { background-image: url("../../../view/theme/diabook/icons/next.png"); background-repeat: no-repeat;} /*.tagged { background-position: -130px -60px;}*/ .attachtype { @@ -247,7 +247,7 @@ background-image: url("../../../images/icons/10/edit.png"); } .icon.s10.star { - background-image: url("../../../images/icons/10/star.png"); + background-image: url("../../../images/star_dummy.png"); } .icon.s10.menu { background-image: url("../../../images/icons/10/menu.png"); @@ -285,7 +285,7 @@ background-image: url("../../../images/icons/16/edit.png"); }*/ .icon.s16.star { - background-image: url("../../../images/icons/16/star.png"); + background-image: url("../../../images/star_dummy.png"); } .icon.s16.menu { background-image: url("../../../images/icons/16/menu.png"); @@ -323,7 +323,7 @@ background-image: url("../../../images/icons/22/edit.png"); } .icon.s22.star { - background-image: url("../../../images/icons/22/star.png"); + background-image: url("../../../images/star_dummy.png"); } .icon.s22.menu { background-image: url("../../../images/icons/22/menu.png"); @@ -361,7 +361,7 @@ background-image: url("../../../images/icons/48/edit.png"); } .icon.s48.star { - background-image: url("../../../images/icons/48/star.png"); + background-image: url("../../../images/star_dummy.png"); } .icon.s48.menu { background-image: url("../../../images/icons/48/menu.png"); @@ -400,6 +400,7 @@ body { margin: 50px auto auto; display: table; } + h4 { font-size: 1.1em; } @@ -515,7 +516,7 @@ header { top: 0px; margin: 0px; padding: 0px; - width: 20%; + width: 22%; height: 32px; background: #000; z-index: 100; @@ -528,8 +529,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 +557,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); @@ -703,21 +705,17 @@ nav #nav-user-linkmenu nav #nav-user-linkmenu{ margin-right: 0px; } -nav #nav-home-link{ +nav #nav-home-link, #nav-directory-link, #nav-apps-link{ margin-left: 0px; + margin-right: 0px; font-weight: bold; + margin: 3px 5px; } nav #nav-directory-link{ - margin-left: 0px; - margin-right: 0px; - font-weight: bold; - margin: 3px 15px; + margin-right: 0px; } -nav #nav-apps-link{ - margin-left: 0px; - margin-right: 0px; - font-weight: bold; - margin: 3px 15px; +nav #nav-home-link{ + margin-left: 0px; } nav #nav-help-link .menu-popup, nav #nav-search-link .menu-popup, @@ -865,6 +863,43 @@ ul.menu-popup .empty { padding: 7px 7px 0px 0px; } +/*profile_side*/ +#profile_side { + margin-bottom: 30px; +} +#ps-usericon{ + height: 25px + } +#ps-username{ + font-size: 1.17em; + font-weight: bold; + vertical-align: top; + position: absolute; + padding-top: 4px; + padding-left: 5px; + color: #2D2D2D; + } +#ps-username:hover{ + text-decoration: none; + } +.menu-profile-side{ + list-style: none; + padding-left: 16px; + min-height: 16px; + } +.menu-profile-list{ + height: auto; + overflow: auto; + padding-top: 3px; + padding-bottom: 3px; + } +.menu-profile-list:hover{ + background: #EEE; + } +.menu-profile-list-item:hover{ + text-decoration: none; + } + /* aside */ aside { display: table-cell; @@ -875,6 +910,7 @@ aside { float: left; /* background: #F1F1F1; */ } + aside .vcard .fn { font-size: 18px; font-weight: bold; @@ -961,6 +997,10 @@ aside #side-peoplefind-url { widht: 55px; height: 55px; } +#lost-password-link { + float: left; + margin-right: 20px; + } /* widget */ .widget { margin-bottom: 2em; @@ -1035,12 +1075,31 @@ section { width: 800px; padding: 0px 0px 0px 12px; } + +body .pageheader{ + text-align: center; + margin-top: 25px; + font-size: 0px; + } + +#id_username { + width: 173px; + } +#id_password { + width: 173px; + } +#id_openid_url { + width: 173px; + } +#contact-edit-end { + } .pager { padding: 10px; text-align: center; font-size: 1.0em; + clear: both; + display: block; } - .tabs { background-position: 0 -20px; @@ -1113,6 +1172,7 @@ section { } .wall-item-container .wall-item-location { padding-right: 40px; + display: table-cell; } .wall-item-container .wall-item-ago { word-wrap: break-word; @@ -1168,6 +1228,7 @@ section { .wall-item-container .wall-item-actions-social { float: left; margin-bottom: 1px; + display: table-cell; } .wall-item-container .wall-item-actions-social a { margin-right: 1em; @@ -1178,6 +1239,7 @@ section { .wall-item-container .wall-item-actions-tools { float: right; width: 80px; + display: table-cell; } .wall-item-container .wall-item-actions-tools a { float: right; @@ -1956,10 +2018,22 @@ box-shadow: 1px 1px 5px 0; } #prvmail-submit { - float: left; + float: right; margin-top: 10px; - margin-right: 30px; } +#prvmail-subject +{ +background: none repeat scroll 0 0 #FFFFFF; +border: 1px solid #CCCCCC; +border-radius: 5px 5px 5px 5px; +font-weight: bold; +height: 20px; +margin: 0 0 5px; +vertical-align: middle; +} +#prvmail-form{ + width: 597px; + } #prvmail-upload-wrapper, #prvmail-link-wrapper, #prvmail-rotator-wrapper { @@ -2147,14 +2221,25 @@ a.mail-list-link { padding: 10px; float: left; } +.lightbox{ + float: left; + } #photo-photo { float: left; } #photo-like-div .wall-item-like-buttons { - float: left; - margin-right: 10px; + float: left; + margin-right: 5px; + margin-top: 30px; } +.comment-edit-text-empty { + margin: 10px 0 0; + width: 85%; +} +.comment-edit-photo { + margin: 10px 0 0; +} .wall-item-like-buttons .icon.like { float: left; } @@ -2296,5 +2381,4 @@ float: left; #photos-upload-newalbum-div { float: left; width: 175px; -} - +}
\ No newline at end of file diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php new file mode 100755 index 000000000..9b3ed30b0 --- /dev/null +++ b/view/theme/diabook/theme.php @@ -0,0 +1,120 @@ +<?php + +/* + * Name: Diabook + * Description: Diabook: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu + * Version: + * Author: + */ + +$a->theme_info = array( + 'extends' => 'diabook', +); + +//profile_side + + + +$nav['usermenu']=array(); +$userinfo = null; + +if(local_user()) { + + + +$r = q("SELECT micro FROM contact WHERE uid=%d AND self=1", intval($a->user['uid'])); + +$userinfo = array( + 'icon' => (count($r) ? $r[0]['micro']: $a->get_baseurl()."/images/default-profile-mm.jpg"), + 'name' => $a->user['username'], + ); + +$ps['usermenu'][status] = Array('profile/' . $a->user['nickname'], t('Home'), "", t('Your posts and conversations')); +$ps['usermenu'][profile] = Array('profile/' . $a->user['nickname']. '?tab=profile', t('Profile'), "", t('Your profile page')); +$ps['usermenu'][photos] = Array('photos/' . $a->user['nickname'], t('Photos'), "", t('Your photos')); +$ps['usermenu'][events] = Array('events/', t('Events'), "", t('Your events')); +$ps['usermenu'][notes] = Array('notes/', t('Personal notes'), "", t('Your personal photos')); + + +if($is_url = preg_match ("/\bnetwork\b/i", $_SERVER['REQUEST_URI'])) { +$tpl = get_markup_template('profile_side.tpl'); + +$a->page['aside'] .= replace_macros($tpl, array( + '$userinfo' => $userinfo, + '$ps' => $ps, + )); +} +} + +//js script + +$a->page['htmlhead'] .= <<< EOT + +<script> + +//contacts +$('html').click(function() { + $('#nav-contacts-linkmenu').removeClass('selected'); + document.getElementById( "nav-contacts-menu" ).style.display = "none"; + }); + + $('#nav-contacts-linkmenu').click(function(event){ + event.stopPropagation(); + }); + +//messages +$('html').click(function() { + $('#nav-messages-linkmenu').removeClass('selected'); + document.getElementById( "nav-messages-menu" ).style.display = "none"; + }); + + $('#nav-messages-linkmenu').click(function(event){ + event.stopPropagation(); + }); + +//notifications +$('html').click(function() { + $('#nav-notifications-linkmenu').removeClass('selected'); + document.getElementById( "nav-notifications-menu" ).style.display = "none"; + }); + + $('#nav-notifications-linkmenu').click(function(event){ + event.stopPropagation(); + }); + +//usermenu +$('html').click(function() { + $('#nav-user-linkmenu').removeClass('selected'); + document.getElementById( "nav-user-menu" ).style.display = "none"; + }); + + $('#nav-user-linkmenu').click(function(event){ + event.stopPropagation(); + }); + + //settingsmenu + $('html').click(function() { + $('#nav-site-linkmenu').removeClass('selected'); + document.getElementById( "nav-site-menu" ).style.display = "none"; + }); + + $('#nav-site-linkmenu').click(function(event){ + event.stopPropagation(); + }); + //appsmenu + $('html').click(function() { + $('#nav-apps-link').removeClass('selected'); + document.getElementById( "nav-apps-menu" ).style.display = "none"; + }); + + $('#nav-apps-link').click(function(event){ + event.stopPropagation(); + }); + + $(function() { + $('a.lightbox').fancybox(); // Select all links with lightbox class +}); + + + </script> +EOT; diff --git a/view/theme/diabook/wall_item.tpl b/view/theme/diabook/wall_item.tpl index b1a014949..ebe40fd4e 100644 --- a/view/theme/diabook/wall_item.tpl +++ b/view/theme/diabook/wall_item.tpl @@ -46,7 +46,7 @@ </div> <div class="wall-item-actions"> - <div class="wall-item-location">$item.location </div> + <div class="wall-item-actions-social"> @@ -82,7 +82,7 @@ <a class="icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a> {{ endif }} </div> - + <div class="wall-item-location">$item.location </div> </div> </div> <div class="wall-item-bottom"> diff --git a/view/theme/diabook/wallwall_item.tpl b/view/theme/diabook/wallwall_item.tpl index 603a908c5..e02e5a8be 100644 --- a/view/theme/diabook/wallwall_item.tpl +++ b/view/theme/diabook/wallwall_item.tpl @@ -52,7 +52,7 @@ </div> <div class="wall-item-actions"> - <div class="wall-item-location">$item.location </div> + <div class="wall-item-actions-social"> @@ -88,7 +88,7 @@ <a class="icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a> {{ endif }} </div> - + <div class="wall-item-location">$item.location </div> </div> </div> <div class="wall-item-bottom"> |