Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-12-23 13:20:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge https://github.com/friendica/friendica into pull

Browse source
This commit is contained in:
friendica 2012-05-10 01:46:29 -07:00
commit 93ae6ee97b
20 changed files with 49 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
view/theme/diabook/admin_site.tpl
View file

@ -49,6 +49,9 @@
{{ inc field_input.tpl with $field=$proxy }}{{ endinc }} {{ inc field_input.tpl with $field=$proxy }}{{ endinc }}
{{ inc field_input.tpl with $field=$proxyuser }}{{ endinc }} {{ inc field_input.tpl with $field=$proxyuser }}{{ endinc }}
{{ inc field_input.tpl with $field=$timeout }}{{ endinc }} {{ inc field_input.tpl with $field=$timeout }}{{ endinc }}
{{ inc field_input.tpl with $field=$delivery_interval }}{{ endinc }}
{{ inc field_input.tpl with $field=$poll_interval }}{{ endinc }}
{{ inc field_input.tpl with $field=$maxloadavg }}{{ endinc }}
{{ inc field_input.tpl with $field=$abandon_days }}{{ endinc }} {{ inc field_input.tpl with $field=$abandon_days }}{{ endinc }}
<div class="submit"><input type="submit" name="page_site" value="$submit" /></div> <div class="submit"><input type="submit" name="page_site" value="$submit" /></div>

2
view/theme/diabook/bottom.tpl
View file

@ -67,12 +67,14 @@ $(document).ready(function() {
$("a#top").attr("id","down"); $("a#top").attr("id","down");
$("a#down").attr("onclick","scrolldown()"); $("a#down").attr("onclick","scrolldown()");
$("img#scroll_top_bottom").attr("src","view/theme/diabook/icons/scroll_bottom.png"); $("img#scroll_top_bottom").attr("src","view/theme/diabook/icons/scroll_bottom.png");
$("img#scroll_top_bottom").attr("title","Scroll to bottom");
} }
if (scrollInfo > "900"){ if (scrollInfo > "900"){
$("a#down").attr("id","top"); $("a#down").attr("id","top");
$("a#top").attr("onclick","scrolltop()"); $("a#top").attr("onclick","scrolltop()");
$("img#scroll_top_bottom").attr("src","view/theme/diabook/icons/scroll_top.png"); $("img#scroll_top_bottom").attr("src","view/theme/diabook/icons/scroll_top.png");
$("img#scroll_top_bottom").attr("title","Back to top");
} }
}); });

5
view/theme/diabook/diabook-aerith/style-wide.css
View file

@ -555,6 +555,7 @@ code {
text-decoration: none; text-decoration: none;
} }
/* popup notifications */ /* popup notifications */
div.jGrowl.top-right { top: 30px; /* put it below header/nav bar */ }
div.jGrowl div.notice { div.jGrowl div.notice {
background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center; background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center;
color: #ffffff; color: #ffffff;
@ -621,9 +622,7 @@ header #banner #logo-img {
margin-top: 3px; margin-top: 3px;
} }
header #banner #logo-text { header #banner #logo-text {
font-size: 20px; font-size: 20px!important;position: relative!important;top: -4px!important;
position: absolute;
top: 10%;
} }
/* messages */ /* messages */
#message-new { #message-new {

5
view/theme/diabook/diabook-aerith/style.css
View file

@ -555,6 +555,7 @@ code {
text-decoration: none; text-decoration: none;
} }
/* popup notifications */ /* popup notifications */
div.jGrowl.top-right { top: 30px; /* put it below header/nav bar */ }
div.jGrowl div.notice { div.jGrowl div.notice {
background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center; background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center;
color: #ffffff; color: #ffffff;
@ -621,9 +622,7 @@ header #banner #logo-img {
margin-top: 3px; margin-top: 3px;
} }
header #banner #logo-text { header #banner #logo-text {
font-size: 20px; font-size: 20px!important;position: relative!important;top: -4px!important;
position: absolute;
top: 10%;
} }
/* messages */ /* messages */
#message-new { #message-new {

5
view/theme/diabook/diabook-blue/style-wide.css
View file

@ -554,6 +554,7 @@ code {
text-decoration: none; text-decoration: none;
} }
/* popup notifications */ /* popup notifications */
div.jGrowl.top-right { top: 30px; /* put it below header/nav bar */ }
div.jGrowl div.notice { div.jGrowl div.notice {
background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center; background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center;
color: #ffffff; color: #ffffff;
@ -607,9 +608,7 @@ header #banner #logo-img {
margin-top: 3px; margin-top: 3px;
} }
header #banner #logo-text { header #banner #logo-text {
font-size: 20px; font-size: 20px!important;position: relative!important;top: -4px!important;
position: absolute;
top: 10%;
} }
/* messages */ /* messages */
#message-new { #message-new {

5
view/theme/diabook/diabook-blue/style.css
View file

@ -554,6 +554,7 @@ code {
text-decoration: none; text-decoration: none;
} }
/* popup notifications */ /* popup notifications */
div.jGrowl.top-right { top: 30px; /* put it below header/nav bar */ }
div.jGrowl div.notice { div.jGrowl div.notice {
background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center; background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center;
color: #ffffff; color: #ffffff;
@ -607,9 +608,7 @@ header #banner #logo-img {
margin-top: 3px; margin-top: 3px;
} }
header #banner #logo-text { header #banner #logo-text {
font-size: 20px; font-size: 20px!important;position: relative!important;top: -4px!important;
position: absolute;
top: 10%;
} }
/* messages */ /* messages */
#message-new { #message-new {

5
view/theme/diabook/diabook-dark/style-wide.css
View file

@ -553,6 +553,7 @@ code {
text-decoration: none; text-decoration: none;
} }
/* popup notifications */ /* popup notifications */
div.jGrowl.top-right { top: 30px; /* put it below header/nav bar */ }
div.jGrowl div.notice { div.jGrowl div.notice {
background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center; background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center;
color: #ffffff; color: #ffffff;
@ -606,9 +607,7 @@ header #banner #logo-img {
margin-top: 3px; margin-top: 3px;
} }
header #banner #logo-text { header #banner #logo-text {
font-size: 20px; font-size: 20px!important;position: relative!important;top: -4px!important;
position: absolute;
top: 10%;
} }
/* messages */ /* messages */
#message-new { #message-new {

5
view/theme/diabook/diabook-dark/style.css
View file

@ -565,6 +565,7 @@ code {
text-decoration: none; text-decoration: none;
} }
/* popup notifications */ /* popup notifications */
div.jGrowl.top-right { top: 30px; /* put it below header/nav bar */ }
div.jGrowl div.notice { div.jGrowl div.notice {
background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center; background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center;
color: #2e2f2e; color: #2e2f2e;
@ -615,9 +616,7 @@ header #banner #logo-img {
margin-top: 3px; margin-top: 3px;
} }
header #banner #logo-text { header #banner #logo-text {
font-size: 20px; font-size: 20px!important;position: relative!important;top: -4px!important;
position: absolute;
top: 10%;
} }
/* messages */ /* messages */
#message-new { #message-new {

5
view/theme/diabook/diabook-green/style-wide.css
View file

@ -555,6 +555,7 @@ code {
text-decoration: none; text-decoration: none;
} }
/* popup notifications */ /* popup notifications */
div.jGrowl.top-right { top: 30px; /* put it below header/nav bar */ }
div.jGrowl div.notice { div.jGrowl div.notice {
background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center; background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center;
color: #ffffff; color: #ffffff;
@ -609,9 +610,7 @@ header #banner #logo-img {
margin-top: 3px; margin-top: 3px;
} }
header #banner #logo-text { header #banner #logo-text {
font-size: 20px; font-size: 20px!important;position: relative!important;top: -4px!important;
position: absolute;
top: 10%;
} }
/* messages */ /* messages */
#message-new { #message-new {

5
view/theme/diabook/diabook-green/style.css
View file

@ -557,6 +557,7 @@ code {
text-decoration: none; text-decoration: none;
} }
/* popup notifications */ /* popup notifications */
div.jGrowl.top-right { top: 30px; /* put it below header/nav bar */ }
div.jGrowl div.notice { div.jGrowl div.notice {
background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center; background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center;
color: #ffffff; color: #ffffff;
@ -611,9 +612,7 @@ header #banner #logo-img {
margin-top: 3px; margin-top: 3px;
} }
header #banner #logo-text { header #banner #logo-text {
font-size: 20px; font-size: 20px!important;position: relative!important;top: -4px!important;
position: absolute;
top: 10%;
} }
/*color*/ /*color*/
/* messages */ /* messages */

5
view/theme/diabook/diabook-pink/style-wide.css
View file

@ -555,6 +555,7 @@ code {
text-decoration: none; text-decoration: none;
} }
/* popup notifications */ /* popup notifications */
div.jGrowl.top-right { top: 30px; /* put it below header/nav bar */ }
div.jGrowl div.notice { div.jGrowl div.notice {
background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center; background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center;
color: #ffffff; color: #ffffff;
@ -609,9 +610,7 @@ header #banner #logo-img {
margin-top: 3px; margin-top: 3px;
} }
header #banner #logo-text { header #banner #logo-text {
font-size: 20px; font-size: 20px!important;position: relative!important;top: -4px!important;
position: absolute;
top: 10%;
} }
/* messages */ /* messages */
#message-new { #message-new {

5
view/theme/diabook/diabook-pink/style.css
View file

@ -557,6 +557,7 @@ code {
text-decoration: none; text-decoration: none;
} }
/* popup notifications */ /* popup notifications */
div.jGrowl.top-right { top: 30px; /* put it below header/nav bar */ }
div.jGrowl div.notice { div.jGrowl div.notice {
background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center; background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center;
color: #ffffff; color: #ffffff;
@ -611,9 +612,7 @@ header #banner #logo-img {
margin-top: 3px; margin-top: 3px;
} }
header #banner #logo-text { header #banner #logo-text {
font-size: 20px; font-size: 20px!important;position: relative!important;top: -4px!important;
position: absolute;
top: 10%;
} }
/* messages */ /* messages */
/*color*/ /*color*/

6
view/theme/diabook/diabook-red/style-wide.css
View file

@ -554,6 +554,7 @@ code {
text-decoration: none; text-decoration: none;
} }
/* popup notifications */ /* popup notifications */
div.jGrowl.top-right { top: 30px; /* put it below header/nav bar */ }
div.jGrowl div.notice { div.jGrowl div.notice {
background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center; background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center;
color: #ffffff; color: #ffffff;
@ -619,10 +620,7 @@ header #banner #logo-img {
margin-top: 3px; margin-top: 3px;
} }
header #banner #logo-text { header #banner #logo-text {
font-size: 20px; font-size: 20px!important;position: relative!important;top: -4px!important;
position: absolute;
top: 10%;
margin-left: 3px;
} }
/* messages */ /* messages */
#message-new { #message-new {

6
view/theme/diabook/diabook-red/style.css
View file

@ -554,6 +554,7 @@ code {
text-decoration: none; text-decoration: none;
} }
/* popup notifications */ /* popup notifications */
div.jGrowl.top-right { top: 30px; /* put it below header/nav bar */ }
div.jGrowl div.notice { div.jGrowl div.notice {
background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center; background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center;
color: #ffffff; color: #ffffff;
@ -619,10 +620,7 @@ header #banner #logo-img {
margin-top: 3px; margin-top: 3px;
} }
header #banner #logo-text { header #banner #logo-text {
font-size: 20px; font-size: 20px!important;position: relative!important;top: -4px!important;
position: absolute;
top: 10%;
margin-left: 3px;
} }
/* messages */ /* messages */
#message-new { #message-new {

2
view/theme/diabook/nav.tpl
View file

@ -136,7 +136,7 @@
</nav> </nav>
<div id="scrollup" style="position: fixed; bottom: 5px; right: 10px;z-index: 97;"><a id="down" onclick="scrolldown()" ><img id="scroll_top_bottom" src="view/theme/diabook/icons/scroll_bottom.png" style="display:cursor !important;" alt="back to top" title="Back to top"></a></div> <div id="scrollup" style="position: fixed; bottom: 5px; right: 10px;z-index: 97;"><a id="down" onclick="scrolldown()" ><img id="scroll_top_bottom" src="view/theme/diabook/icons/scroll_bottom.png" style="display:cursor !important;" alt="back to top" title="Scroll to bottom"></a></div>
<div style="position: fixed; bottom: 3px; left: 25px;">$langselector</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> <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>

4
view/theme/diabook/style-wide.css
View file

@ -610,9 +610,7 @@ header #banner #logo-img {
margin-top: 3px; margin-top: 3px;
} }
header #banner #logo-text { header #banner #logo-text {
font-size: 20px; font-size: 20px!important;position: relative!important;top: -4px!important;
position: absolute;
top: 10%;
} }
/* messages */ /* messages */
#message-new { #message-new {

4
view/theme/diabook/style.css
View file

@ -611,9 +611,7 @@ header #banner #logo-img {
margin-top: 3px; margin-top: 3px;
} }
header #banner #logo-text { header #banner #logo-text {
font-size: 20px; font-size: 20px!important;position: relative!important;top: -4px!important;
position: absolute;
top: 10%;
} }
/* messages */ /* messages */
#message-new { #message-new {

8
view/theme/diabook/theme.php
View file

@ -3,7 +3,7 @@
/* /*
* Name: Diabook * Name: Diabook
* Description: Diabook: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu * Description: Diabook: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
* Version: (Version: 1.026) * Version: (Version: 1.027)
* Author: * Author:
*/ */
@ -13,7 +13,7 @@ $a = get_app();
function diabook_init(&$a) { function diabook_init(&$a) {
//print diabook-version for debugging //print diabook-version for debugging
$diabook_version = "Diabook (Version: 1.026)"; $diabook_version = "Diabook (Version: 1.027)";
$a->page['htmlhead'] .= sprintf('<META NAME="theme" CONTENT="%s"/>', $diabook_version); $a->page['htmlhead'] .= sprintf('<META NAME="theme" CONTENT="%s"/>', $diabook_version);
//change css on network and profilepages //change css on network and profilepages
@ -401,7 +401,7 @@ if ($color=="dark") $color_path = "/diabook-dark/";
// custom css // custom css
if (!is_null($cssFile)) $a->page['htmlhead'] .= sprintf('<link rel="stylesheet" type="text/css" href="%s" />', $cssFile); if (!is_null($cssFile)) $a->page['htmlhead'] .= sprintf('<link rel="stylesheet" type="text/css" href="%s" />', $cssFile);
//footer //footer
$tpl = get_markup_template('footer.tpl'); $tpl = get_markup_template('footer.tpl');
$a->page['footer'] .= replace_macros($tpl, array()); $a->page['footer'] .= replace_macros($tpl, array());
@ -568,7 +568,7 @@ if ($color=="dark") $color_path = "/diabook-dark/";
if($close_pages != "1") { if($close_pages != "1") {
if(local_user()) { if(local_user()) {
$page = ' $page = '
<h3 style="margin-top:0px;">'.t("Community Pages").'<a id="closeicon" href="#boxsettings" onClick="open_boxsettings(); return false;" style="text-decoration:none;" class="icon close_box" title="close"></a></h3> <h3 style="margin-top:0px;">'.t("Community Pages").'<a id="closeicon" href="#boxsettings" onClick="open_boxsettings(); return false;" style="text-decoration:none;" class="icon close_box" title="'.t("Settings").'"></a></h3>
<div id=""><ul style="margin-left: 7px;margin-top: 0px;padding-left: 0px;padding-top: 0px;">'; <div id=""><ul style="margin-left: 7px;margin-top: 0px;padding-left: 0px;padding-top: 0px;">';
$pagelist = array(); $pagelist = array();

7
view/theme/dispy/dark/style.css
View file

@ -48,7 +48,7 @@ h1,h2,h3,h4,h5,h6{margin:10px 0px;font-weight:bold;border-bottom:1px solid #638e
.action{margin:5px 0;} .action{margin:5px 0;}
.tool{margin:5px 0;list-style:none;} .tool{margin:5px 0;list-style:none;}
#articlemain{width:100%;height:100%;margin:0 auto;} #articlemain{width:100%;height:100%;margin:0 auto;}
[class$="-desc"],[id$="-desc"]{color:#2e2f2e;background:#eeeecc;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;-moz-box-shadow:3px 3px 5px 0px #111111;-o-box-shadow:3px 3px 5px 0px #111111;-webkit-box-shadow:3px 3px 5px 0px #111111;-ms-box-shadow:3px 3px 5px 0px #111111;box-shadow:3px 3px 5px 0px #111111;margin:3px 10px 7px 0;padding:6px 7px;font-weight:bold;font-size:smaller;} [class$="-desc"],[id$="-desc"]{color:#2e2f2e;background:#eeeecc;margin:3px 10px 7px 0;padding:6px 7px;font-weight:bold;font-size:smaller;}
#asidemain .field{overflow:hidden;width:200px;} #asidemain .field{overflow:hidden;width:200px;}
#login-extra-links{overflow:auto !important;padding-top:60px !important;width:100% !important;}#login-extra-links a{margin-right:20px;} #login-extra-links{overflow:auto !important;padding-top:60px !important;width:100% !important;}#login-extra-links a{margin-right:20px;}
#login_standard{display:block !important;float:none !important;height:100% !important;position:relative !important;width:100% !important;}#login_standard .field label{width:200px !important;} #login_standard{display:block !important;float:none !important;height:100% !important;position:relative !important;width:100% !important;}#login_standard .field label{width:200px !important;}
@ -279,11 +279,12 @@ div[id$="wrapper"]{height:100%;margin-bottom:1em;}div[id$="wrapper"] br{clear:le
.mail-conv-subject{clear:right;font-weight:bold;font-size:1.2em;} .mail-conv-subject{clear:right;font-weight:bold;font-size:1.2em;}
.mail-conv-body{clear:both;} .mail-conv-body{clear:both;}
.mail-conv-delete-wrapper{margin-top:5px;} .mail-conv-delete-wrapper{margin-top:5px;}
.view-contact-wrapper,.contact-entry-wrapper{float:left;margin:0 5px 40px 0;width:120px;height:120px;padding:3px;position:relative;} .view-contact-wrapper,.contact-entry-wrapper{float:left;margin:0 5px 40px 0;width:120px;height:135px;padding:3px;position:relative;}
.contact-direction-wrapper{position:absolute;top:20px;} .contact-direction-wrapper{position:absolute;top:20px;}
.contact-edit-links{position:absolute;top:60px;} .contact-edit-links{position:absolute;top:60px;}
.contact-entry-photo{margin-left:20px;} .contact-entry-photo{margin-left:20px;}
.contact-entry-name{width:120px;font-weight:bold;} .contact-entry-name{width:120px;font-weight:bold;font-size:small;}
.contact-entry-details{font-size:x-small;}
.contact-entry-photo{position:relative;} .contact-entry-photo{position:relative;}
.contact-entry-edit-links .icon{border:1px solid #babdb6;-o-border-radius:3px;-webkit-border-radius:3px;-moz-border-radius:3px;-ms-border-radius:3px;border-radius:3px;background-color:white;} .contact-entry-edit-links .icon{border:1px solid #babdb6;-o-border-radius:3px;-webkit-border-radius:3px;-moz-border-radius:3px;-ms-border-radius:3px;border-radius:3px;background-color:white;}
#contact-entry-url,[id^="contact-entry-url"],#contact-entry-network,[id^="contact-entry-network"]{font-size:smaller;} #contact-entry-url,[id^="contact-entry-url"],#contact-entry-network,[id^="contact-entry-network"]{font-size:smaller;}

13
view/theme/dispy/dark/style.less
View file

@ -268,8 +268,8 @@ h4, h5, h6 {
[class$="-desc"], [id$="-desc"] { [class$="-desc"], [id$="-desc"] {
color: @bg_colour; color: @bg_colour;
background: @main_colour; background: @main_colour;
.rounded_corners; // .rounded_corners;
.box_shadow(3px, 3px, 5px); // .box_shadow(3px, 3px, 5px);
margin: 3px 10px 7px 0; margin: 3px 10px 7px 0;
padding: 6px 7px; padding: 6px 7px;
font-weight: bold; font-weight: bold;
@ -1736,10 +1736,11 @@ div {
/** /**
* contacts * contacts
*/ */
.view-contact-wrapper, .contact-entry-wrapper { .view-contact-wrapper,
.contact-entry-wrapper {
float: left; float: left;
margin: 0 5px 40px 0; margin: 0 5px 40px 0;
.box(120px, 120px); .box(120px, 135px);
padding: 3px; padding: 3px;
position: relative; position: relative;
} }
@ -1759,6 +1760,10 @@ div {
.contact-entry-name { .contact-entry-name {
width: 120px; width: 120px;
font-weight: bold; font-weight: bold;
font-size: small;
}
.contact-entry-details {
font-size: x-small;
} }
.contact-entry-photo { .contact-entry-photo {
position: relative; position: relative;