diff options
Diffstat (limited to 'view/theme/diabook')
| -rwxr-xr-x | view/theme/diabook/jot.tpl | 2 | ||||
| -rw-r--r-- | view/theme/diabook/profile_vcard.tpl | 4 | ||||
| -rw-r--r-- | view/theme/diabook/style-network.css | 16 | ||||
| -rw-r--r-- | view/theme/diabook/style-profile.css | 20 | ||||
| -rw-r--r-- | view/theme/diabook/style-settings.css | 7 | ||||
| -rw-r--r-- | view/theme/diabook/style.css | 20 | ||||
| -rwxr-xr-x | view/theme/diabook/theme.php | 73 | ||||
| -rw-r--r-- | view/theme/diabook/wallwall_item.tpl | 4 |
8 files changed, 93 insertions, 53 deletions
diff --git a/view/theme/diabook/jot.tpl b/view/theme/diabook/jot.tpl index 9aef99787..bd43994b5 100755 --- a/view/theme/diabook/jot.tpl +++ b/view/theme/diabook/jot.tpl @@ -2,7 +2,6 @@ <div id="profile-jot-wrapper" > <div id="profile-jot-banner-wrapper"> <div id="profile-jot-desc" > </div> - <div id="character-counter" class="grey"></div> </div> <div id="profile-jot-banner-end"></div> @@ -15,6 +14,7 @@ <input type="hidden" name="post_id" value="$post_id" /> <input type="hidden" name="preview" id="jot-preview" value="0" /> <input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none"> + <div id="character-counter" class="grey"></div> <img id="profile-jot-text-loading" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" /> <textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{ if $content }}$content{{ else }}$share{{ endif }}</textarea> diff --git a/view/theme/diabook/profile_vcard.tpl b/view/theme/diabook/profile_vcard.tpl index 918cfc97c..e28ec2909 100644 --- a/view/theme/diabook/profile_vcard.tpl +++ b/view/theme/diabook/profile_vcard.tpl @@ -21,9 +21,9 @@ </div> - {{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }} - <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" width="155" height="155" src="$profile.photo?rev=$profile.picdate" alt="$profile.name" /></div> + {{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }} {{ if $location }} diff --git a/view/theme/diabook/style-network.css b/view/theme/diabook/style-network.css index 518e7b88d..d226c70fd 100644 --- a/view/theme/diabook/style-network.css +++ b/view/theme/diabook/style-network.css @@ -1144,8 +1144,13 @@ section { body .pageheader{ text-align: center; - margin-top: 25px; - font-size: 0px; + font-size: 20px; + margin-bottom: 20px; + margin-top: 0px; + max-width: 575px; + } +.qcomment{ + max-width: 122px; } #id_username { @@ -1196,7 +1201,7 @@ right_aside { /* background: #F1F1F1; */ } -right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 5px; margin-bottom: 0px; +right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 3px; margin-bottom: 0px; margin-top:30px;} right_aside .directory-item { width: 50px; height: 50px; vertical-align: center; text-align: center; } right_aside .directory-photo { margin: 0px; } @@ -1544,6 +1549,11 @@ transition: all 0.2s ease-in-out; padding: 0.3em; margin-bottom: 10px; } +.grey +{ + display: inline; + float: right; + } #jot #jot-tools { margin: 0px; padding: 0px; diff --git a/view/theme/diabook/style-profile.css b/view/theme/diabook/style-profile.css index 0077510a1..f1672f4b4 100644 --- a/view/theme/diabook/style-profile.css +++ b/view/theme/diabook/style-profile.css @@ -1138,10 +1138,14 @@ section { body .pageheader{ text-align: center; - margin-top: 25px; - font-size: 0px; + font-size: 20px; + margin-bottom: 20px; + margin-top: 0px; + max-width: 575px; + } +.qcomment{ + max-width: 122px; } - #id_username { width: 173px; } @@ -1191,7 +1195,7 @@ right_aside { /* background: #F1F1F1; */ } -right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 5px; margin-bottom: 0px; +right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 3px; margin-bottom: 0px; margin-top:30px;} right_aside .directory-item { width: 50px; height: 50px; vertical-align: center; text-align: center; } right_aside .directory-photo { margin: 0px; } @@ -1539,6 +1543,11 @@ transition: all 0.2s ease-in-out; padding: 0.3em; margin-bottom: 10px; } +.grey +{ + display: inline; + float: right; + } #jot #jot-tools { margin: 0px; padding: 0px; @@ -2003,6 +2012,9 @@ ul.tabs li .active { float: left; } /* photo */ +.photo { +border-radius: 10px; + } .lframe { float: left; } diff --git a/view/theme/diabook/style-settings.css b/view/theme/diabook/style-settings.css index 46f7e957e..b23c2bb1b 100644 --- a/view/theme/diabook/style-settings.css +++ b/view/theme/diabook/style-settings.css @@ -1135,8 +1135,11 @@ section { body .pageheader{ text-align: center; - margin-top: 25px; - font-size: 0px; + font-size: 20px; + max-width: 575px; + margin-bottom: 20px; + margin-top: 0px; + max-width: 575px; } #id_username { diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css index 97a26a41d..c8efeab33 100644 --- a/view/theme/diabook/style.css +++ b/view/theme/diabook/style.css @@ -1022,7 +1022,7 @@ aside { float: left; /* background: #F1F1F1; */ } - +aside #page-sidebar{display: none;} aside .vcard .fn { font-size: 18px; font-weight: bold; @@ -1190,10 +1190,14 @@ section { body .pageheader{ text-align: center; - margin-top: 25px; - font-size: 0px; + font-size: 20px; + margin-bottom: 20px; + margin-top: 0px; + max-width: 575px; + } +.qcomment{ + max-width: 122px; } - #id_username { width: 173px; } @@ -1550,6 +1554,11 @@ body .pageheader{ padding: 0.3em; margin-bottom: 10px; } +.grey +{ + display: inline; + float: right; + } #jot #jot-tools { margin: 0px; padding: 0px; @@ -2014,6 +2023,9 @@ ul.tabs li .active { float: left; } /* photo */ +.photo { +border-radius: 10px; + } .lframe { float: left; } diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php index d6ee57316..2fe985060 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: (Version: 1.011) * Author: */ @@ -169,7 +169,8 @@ function diabook_community_info(){ $pagelist = array(); $contacts = q("SELECT `id`, `url`, `name`, `micro`FROM `contact` - WHERE `network`= 'dfrn' AND `forum` = 1 AND `uid` = %d", + WHERE `network`= 'dfrn' AND `forum` = 1 AND `uid` = %d + ORDER BY `name` ASC", intval($a->user['uid']) ); @@ -264,7 +265,7 @@ if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname']){ } } -//tabs at right_aside on settings page +//tabs at aside on settings page if ($a->argv[0] === "settings"){ $tabs = array( @@ -323,55 +324,58 @@ $a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></scrip //js scripts -$a->page['htmlhead'] .= <<< EOT +$a->page['htmlhead'] .= ' <script> $(function() { - $('a.lightbox').fancybox(); // Select all links with lightbox class + $("a.lightbox").fancybox(); // Select all links with lightbox class }); - </script> + </script>'; + +if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] or $a->argv[0] === "network" && local_user()){ +$a->page['htmlhead'] .= ' <script> $("right_aside").ready(function(){ - if($.cookie('close_pages') == '1') + if($.cookie("close_pages") == "1") { document.getElementById( "close_pages" ).style.display = "none"; }; - if($.cookie('close_helpers') == '1') + if($.cookie("close_helpers") == "1") { document.getElementById( "close_helpers" ).style.display = "none"; }; - if($.cookie('close_services') == '1') + if($.cookie("close_services") == "1") { document.getElementById( "close_services" ).style.display = "none"; }; - if($.cookie('close_friends') == '1') + if($.cookie("close_friends") == "1") { document.getElementById( "close_friends" ).style.display = "none"; }; - if($.cookie('close_postit') == '1') + if($.cookie("close_postit") == "1") { document.getElementById( "close_postit" ).style.display = "none"; }; - if($.cookie('close_lastusers') == '1') + if($.cookie("close_lastusers") == "1") { document.getElementById( "close_lastusers" ).style.display = "none"; }; - if($.cookie('close_lastphotos') == '1') + if($.cookie("close_lastphotos") == "1") { document.getElementById( "close_lastphotos" ).style.display = "none"; }; - if($.cookie('close_lastlikes') == '1') + if($.cookie("close_lastlikes") == "1") { document.getElementById( "close_lastlikes" ).style.display = "none"; };} @@ -380,60 +384,55 @@ $("right_aside").ready(function(){ function close_pages(){ document.getElementById( "close_pages" ).style.display = "none"; - $.cookie('close_pages','1', { expires: 365, path: '/' }); + $.cookie("close_pages","1", { expires: 365, path: "/" }); }; function close_helpers(){ document.getElementById( "close_helpers" ).style.display = "none"; - $.cookie('close_helpers','1', { expires: 365, path: '/' }); + $.cookie("close_helpers","1", { expires: 365, path: "/" }); }; function close_services(){ document.getElementById( "close_services" ).style.display = "none"; - $.cookie('close_services','1', { expires: 365, path: '/' }); + $.cookie("close_services","1", { expires: 365, path: "/" }); }; function close_friends(){ document.getElementById( "close_friends" ).style.display = "none"; - $.cookie('close_friends','1', { expires: 365, path: '/' }); + $.cookie("close_friends","1", { expires: 365, path: "/" }); }; function close_postit(){ document.getElementById( "close_postit" ).style.display = "none"; - $.cookie('close_postit','1', { expires: 365, path: '/' }); + $.cookie("close_postit","1", { expires: 365, path: "/" }); }; function close_lastusers(){ document.getElementById( "close_lastusers" ).style.display = "none"; - $.cookie('close_lastusers','1', { expires: 365, path: '/' }); + $.cookie("close_lastusers","1", { expires: 365, path: "/" }); }; function close_lastphotos(){ document.getElementById( "close_lastphotos" ).style.display = "none"; - $.cookie('close_lastphotos','1', { expires: 365, path: '/' }); + $.cookie("close_lastphotos","1", { expires: 365, path: "/" }); }; function close_lastlikes(){ document.getElementById( "close_lastlikes" ).style.display = "none"; - $.cookie('close_lastlikes','1', { expires: 365, path: '/' }); + $.cookie("close_lastlikes","1", { expires: 365, path: "/" }); }; function restore_boxes(){ - $.cookie('close_pages','2', { expires: 365, path: '/' }); - $.cookie('close_helpers','2', { expires: 365, path: '/' }); - $.cookie('close_services','2', { expires: 365, path: '/' }); - $.cookie('close_friends','2', { expires: 365, path: '/' }); - $.cookie('close_postit','2', { expires: 365, path: '/' }); - $.cookie('close_lastusers','2', { expires: 365, path: '/' }); - $.cookie('close_lastphotos','2', { expires: 365, path: '/' }); - $.cookie('close_lastlikes','2', { expires: 365, path: '/' }); - alert('Right-hand column was restored. Please refresh your browser'); + $.cookie("close_pages","2", { expires: 365, path: "/" }); + $.cookie("close_helpers","2", { expires: 365, path: "/" }); + $.cookie("close_services","2", { expires: 365, path: "/" }); + $.cookie("close_friends","2", { expires: 365, path: "/" }); + $.cookie("close_postit","2", { expires: 365, path: "/" }); + $.cookie("close_lastusers","2", { expires: 365, path: "/" }); + $.cookie("close_lastphotos","2", { expires: 365, path: "/" }); + $.cookie("close_lastlikes","2", { expires: 365, path: "/" }); + alert("Right-hand column was restored. Please refresh your browser"); }; - - -</script> - - -EOT; +</script>';}
\ No newline at end of file diff --git a/view/theme/diabook/wallwall_item.tpl b/view/theme/diabook/wallwall_item.tpl index c5b6b36b5..bee75ad99 100644 --- a/view/theme/diabook/wallwall_item.tpl +++ b/view/theme/diabook/wallwall_item.tpl @@ -71,6 +71,10 @@ <a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a> {{ endif }} + {{ if $item.filer }} + <a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item icon file-as" title="$item.star.filer"></a> + {{ endif }} + {{ if $item.plink }}<a class="icon link" title="$item.plink.title" href="$item.plink.href">$item.plink.title</a>{{ endif }} |