MrPetovan/friendica
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

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

Browse source
This commit is contained in:
friendica 2012-10-09 17:04:13 -07:00
parent 987b8b4880 d9e2dd0523
commit 49ec50b36e
9 changed files with 419 additions and 376 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
INSTALL.txt
View file

@ -51,6 +51,10 @@ php.ini file [or see 'poormancron' in section 8]
directory/path component in the URL) is preferred. This is REQUIRED if directory/path component in the URL) is preferred. This is REQUIRED if
you wish to communicate with the Diaspora network. you wish to communicate with the Diaspora network.
- For alternative server configurations (such as Nginx server and MariaDB
database engine), refer to the wiki at https://github.com/friendica/friendica/wiki
2. Unpack the Friendica files into the root of your web server document area. 2. Unpack the Friendica files into the root of your web server document area.
- If you copy the directory tree to your webserver, make sure - If you copy the directory tree to your webserver, make sure

624
view/cs/messages.po
View file

File diff suppressed because it is too large Load diff

26
view/cs/strings.php
View file

@ -135,13 +135,19 @@ $a->strings["Edit post"] = "Upravit příspěvek";
$a->strings["Post to Email"] = "Poslat příspěvek na e-mail"; $a->strings["Post to Email"] = "Poslat příspěvek na e-mail";
$a->strings["Edit"] = "Upravit"; $a->strings["Edit"] = "Upravit";
$a->strings["Upload photo"] = "Nahrát fotografii"; $a->strings["Upload photo"] = "Nahrát fotografii";
$a->strings["upload photo"] = "nahrát fotky";
$a->strings["Attach file"] = "Přiložit soubor"; $a->strings["Attach file"] = "Přiložit soubor";
$a->strings["attach file"] = "přidat soubor";
$a->strings["Insert web link"] = "Vložit webový odkaz"; $a->strings["Insert web link"] = "Vložit webový odkaz";
$a->strings["Insert YouTube video"] = "Vložit YouTube video"; $a->strings["web link"] = "webový odkaz";
$a->strings["Insert Vorbis [.ogg] video"] = "Vložit Vorbis [.ogg] video"; $a->strings["Insert video link"] = "Zadejte odkaz na video";
$a->strings["Insert Vorbis [.ogg] audio"] = "Vložit Vorbis [.ogg] audio"; $a->strings["video link"] = "odkaz na video";
$a->strings["Insert audio link"] = "Zadejte odkaz na zvukový záznam";
$a->strings["audio link"] = "odkaz na audio";
$a->strings["Set your location"] = "Nastavte vaši polohu"; $a->strings["Set your location"] = "Nastavte vaši polohu";
$a->strings["set location"] = "nastavit místo";
$a->strings["Clear browser location"] = "Odstranit adresu v prohlížeči"; $a->strings["Clear browser location"] = "Odstranit adresu v prohlížeči";
$a->strings["clear location"] = "vymazat místo";
$a->strings["Permission settings"] = "Nastavení oprávnění"; $a->strings["Permission settings"] = "Nastavení oprávnění";
$a->strings["CC: email addresses"] = "skrytá kopie: e-mailové adresy"; $a->strings["CC: email addresses"] = "skrytá kopie: e-mailové adresy";
$a->strings["Public post"] = "Veřejný příspěvek"; $a->strings["Public post"] = "Veřejný příspěvek";
@ -1498,7 +1504,7 @@ $a->strings["Encrypt Jabber password with Friendica password (recommended)"] = "
$a->strings["Friendica password"] = "Friendica heslo"; $a->strings["Friendica password"] = "Friendica heslo";
$a->strings["Approve subscription requests from Friendica contacts automatically"] = "Automaticky schválit požadavek na členství od Friedica kontaktů."; $a->strings["Approve subscription requests from Friendica contacts automatically"] = "Automaticky schválit požadavek na členství od Friedica kontaktů.";
$a->strings["Subscribe to Friendica contacts automatically"] = "Automaticky zaslat požadavek na členství Friedica kontaktům."; $a->strings["Subscribe to Friendica contacts automatically"] = "Automaticky zaslat požadavek na členství Friedica kontaktům.";
$a->strings["Purge internal list of jabber addresses of contacts"] = ""; $a->strings["Purge internal list of jabber addresses of contacts"] = "Očistit interní seznam jabber adres kontaktů";
$a->strings["Add contact"] = "Přidat kontakt"; $a->strings["Add contact"] = "Přidat kontakt";
$a->strings["View Source"] = "Zobrazit zdroj"; $a->strings["View Source"] = "Zobrazit zdroj";
$a->strings["Post to StatusNet"] = "Poslat příspěvek na StatusNet"; $a->strings["Post to StatusNet"] = "Poslat příspěvek na StatusNet";
@ -1640,6 +1646,8 @@ $a->strings["Last tweets"] = "Poslední tweety";
$a->strings["Alignment"] = "Zarovnání"; $a->strings["Alignment"] = "Zarovnání";
$a->strings["Left"] = "Vlevo"; $a->strings["Left"] = "Vlevo";
$a->strings["Center"] = "Uprostřed"; $a->strings["Center"] = "Uprostřed";
$a->strings["Posts font size"] = "Velikost písma u příspěvků";
$a->strings["Textareas font size"] = "Velikost písma textů";
$a->strings["Set colour scheme"] = "Nastavit barevné schéma"; $a->strings["Set colour scheme"] = "Nastavit barevné schéma";
$a->strings["j F, Y"] = "j F, Y"; $a->strings["j F, Y"] = "j F, Y";
$a->strings["j F"] = "j F"; $a->strings["j F"] = "j F";
@ -1982,15 +1990,6 @@ $a->strings["Please enter a video link/URL:"] = "Prosím zadejte URL adresu vide
$a->strings["Please enter an audio link/URL:"] = "Prosím zadejte URL adresu zvukového záznamu:"; $a->strings["Please enter an audio link/URL:"] = "Prosím zadejte URL adresu zvukového záznamu:";
$a->strings["Tag term:"] = "Štítek:"; $a->strings["Tag term:"] = "Štítek:";
$a->strings["Where are you right now?"] = "Kde právě jste?"; $a->strings["Where are you right now?"] = "Kde právě jste?";
$a->strings["upload photo"] = "nahrát fotky";
$a->strings["attach file"] = "přidat soubor";
$a->strings["web link"] = "webový odkaz";
$a->strings["Insert video link"] = "Zadejte odkaz na video";
$a->strings["video link"] = "odkaz na video";
$a->strings["Insert audio link"] = "Zadejte odkaz na zvukový záznam";
$a->strings["audio link"] = "odkaz na audio";
$a->strings["set location"] = "nastavit místo";
$a->strings["clear location"] = "vymazat místo";
$a->strings["permissions"] = "oprávnění"; $a->strings["permissions"] = "oprávnění";
$a->strings["Click here to upgrade."] = "Klikněte zde pro aktualizaci."; $a->strings["Click here to upgrade."] = "Klikněte zde pro aktualizaci.";
$a->strings["This action exceeds the limits set by your subscription plan."] = "Tato akce překročí limit nastavené Vaším předplatným."; $a->strings["This action exceeds the limits set by your subscription plan."] = "Tato akce překročí limit nastavené Vaším předplatným.";
@ -2019,3 +2018,4 @@ $a->strings["Status Messages and Posts"] = "Statusové zprávy a příspěvky ";
$a->strings["Profile Details"] = "Detaily profilu"; $a->strings["Profile Details"] = "Detaily profilu";
$a->strings["Events and Calendar"] = "Události a kalendář"; $a->strings["Events and Calendar"] = "Události a kalendář";
$a->strings["Only You Can See This"] = "Toto můžete vidět jen Vy"; $a->strings["Only You Can See This"] = "Toto můžete vidět jen Vy";
$a->strings["toggle mobile"] = "";

14
view/theme/frost-mobile/style.css
View file

@ -1140,8 +1140,11 @@ input#dfrn-url {
margin-top: 10px; margin-top: 10px;
} }
.toplevel_item {
margin-bottom: 60px;
}
.wall-item-content-wrapper { .wall-item-content-wrapper {
margin-top: 60px;
padding-top: 30px; padding-top: 30px;
border-top: 2px solid #AAAAAA; border-top: 2px solid #AAAAAA;
position: relative; position: relative;
@ -1238,9 +1241,6 @@ input#dfrn-url {
top: 80px; top: 80px;
/* z-index: 100;*/ /* z-index: 100;*/
} }
.wall-item-wrapper {
margin-left:10px;
}
.wall-item-lock { .wall-item-lock {
margin-top: 30px; margin-top: 30px;
left: 105px; left: 105px;
@ -1395,6 +1395,7 @@ input#dfrn-url {
.wall-item-body { .wall-item-body {
text-align: justify; text-align: justify;
float: left; float: left;
clear: left;
/* width: 300px;*/ /* width: 300px;*/
overflow: hidden; overflow: hidden;
margin-top: 10px; margin-top: 10px;
@ -3289,6 +3290,11 @@ aside input[type='text'] {
margin-top: 10px; margin-top: 10px;
} }
.filesavetags, .categorytags {
display: block;
clear: left;
}
.body-tag, .filesavetags, .categorytags { .body-tag, .filesavetags, .categorytags {
opacity: 0.5; opacity: 0.5;
filter:alpha(opacity=50); filter:alpha(opacity=50);

2
view/theme/frost-mobile/theme.php
View file

@ -4,7 +4,7 @@
* Name: Frost--mobile version * Name: Frost--mobile version
* Description: Like frosted glass * Description: Like frosted glass
* Credits: Navigation icons taken from http://iconza.com. Other icons taken from http://thenounproject.com, including: Like, Dislike, Black Lock, Unlock, Pencil, Tag, Camera, Paperclip (Marie Coons), Folder (Sergio Calcara), Chain-link (Andrew Fortnum), Speaker (Harold Kim), Quotes (Henry Ryder), Video Camera (Anas Ramadan), and Left Arrow, Right Arrow, and Delete X (all three P.J. Onori). All under Attribution (CC BY 3.0). Others from The Noun Project are public domain or No Rights Reserved (CC0). * Credits: Navigation icons taken from http://iconza.com. Other icons taken from http://thenounproject.com, including: Like, Dislike, Black Lock, Unlock, Pencil, Tag, Camera, Paperclip (Marie Coons), Folder (Sergio Calcara), Chain-link (Andrew Fortnum), Speaker (Harold Kim), Quotes (Henry Ryder), Video Camera (Anas Ramadan), and Left Arrow, Right Arrow, and Delete X (all three P.J. Onori). All under Attribution (CC BY 3.0). Others from The Noun Project are public domain or No Rights Reserved (CC0).
* Version: Version 0.2.14 * Version: Version 0.2.15
* Author: Zach P <techcity@f.shmuz.in> * Author: Zach P <techcity@f.shmuz.in>
* Maintainer: Zach P <techcity@f.shmuz.in> * Maintainer: Zach P <techcity@f.shmuz.in>
*/ */

2
view/theme/frost/default.php
View file

@ -28,11 +28,9 @@
<!--<div class='main-content-loading'><img src="/view/theme/frost/images/ajax-loader.gif" alt="Please wait..."></div>--> <!--<div class='main-content-loading'><img src="/view/theme/frost/images/ajax-loader.gif" alt="Please wait..."></div>-->
<div class='main-content-container'> <div class='main-content-container'>
<aside><?php if(x($page,'aside')) echo $page['aside']; ?></aside> <aside><?php if(x($page,'aside')) echo $page['aside']; ?></aside>
<div class='section-wrapper'>
<section><?php if(x($page,'content')) echo $page['content']; ?> <section><?php if(x($page,'content')) echo $page['content']; ?>
<div id="page-footer"></div> <div id="page-footer"></div>
</section> </section>
</div>
<right_aside><?php if(x($page,'right_aside')) echo $page['right_aside']; ?></right_aside> <right_aside><?php if(x($page,'right_aside')) echo $page['right_aside']; ?></right_aside>
<footer><?php if(x($page,'footer')) echo $page['footer']; ?></footer> <footer><?php if(x($page,'footer')) echo $page['footer']; ?></footer>
</div> </div>

97
view/theme/frost/style.css
View file

@ -78,9 +78,10 @@ blockquote {
} }
.hide-comments-outer { .hide-comments-outer {
margin-left: 0px; margin-left: 75px;
font-weight: 700; font-weight: 700;
opacity: 0.4; opacity: 0.4;
border-bottom: 1px solid #AAA;
} }
.hide-comments-outer:hover { .hide-comments-outer:hover {
opacity: 1.0; opacity: 1.0;
@ -297,37 +298,29 @@ aside {
} }
/* section */ /* section */
div.section-wrapper { section {
width: 565px; width: 565px;
margin-left: auto;
margin-right: auto;
padding-right:2em;
display: block; display: block;
background-color: #ffffff; margin-left: auto;
background-image: url(border.jpg); margin-right: auto;
background-position: top right; margin-top: 0px;
background-repeat: no-repeat; margin-bottom: 0px;
}
section {
margin: 0px 0px 0px 0px;
width: 100%;
padding-left: 1em; padding-left: 1em;
padding-right: 1em; padding-right: 1em;
padding-top: 1em; padding-top: 1em;
background-image: url(border.jpg); background-color: #ffffff;
/* background-image: url(border.jpg);
background-position: top left; background-position: top left;
background-repeat: no-repeat; background-repeat: no-repeat;*/
min-height: 112px; min-height: 112px;
border-top: 1px solid #babdb6; border-top: 1px solid #babdb6;
border-left: 1px dotted #AAA;
border-right: 1px dotted #AAA;
} }
.tabs { .tabs {
@ -1104,8 +1097,11 @@ input#dfrn-url {
margin-top: 10px; margin-top: 10px;
} }
.toplevel_item {
margin-bottom: 40px;
}
.wall-item-content-wrapper { .wall-item-content-wrapper {
margin-top: 60px;
padding-top: 30px; padding-top: 30px;
border-top: 2px solid #AAA; border-top: 2px solid #AAA;
position: relative; position: relative;
@ -1114,8 +1110,8 @@ input#dfrn-url {
.wall-item-content-wrapper.comment { .wall-item-content-wrapper.comment {
margin-top: 10px; margin-top: 10px;
padding-top: none; padding-top: 0px;
margin-left: 50px; margin-left: 75px;
border: none; border: none;
} }
@ -1124,12 +1120,18 @@ input#dfrn-url {
margin-left: 0px; margin-left: 0px;
opacity: 0.4; opacity: 0.4;
} }
.wall-item-dislike {
margin-bottom: 15px;
}
.wall-item-like:hover, .wall-item-dislike:hover { .wall-item-like:hover, .wall-item-dislike:hover {
opacity: 1.0; opacity: 1.0;
} }
.wall-item-like.comment, .wall-item-dislike.comment { .wall-item-like.comment, .wall-item-dislike.comment {
margin-left: 50px; margin-left: 75px;
}
.wall-item-dislike.comment {
margin-bottom: 0px;
} }
.wall-item-info { .wall-item-info {
@ -1176,8 +1178,8 @@ input#dfrn-url {
.wall-item-photo-menu li a:hover { color: #FFFFFF; background: #3465A4; text-decoration: none; } .wall-item-photo-menu li a:hover { color: #FFFFFF; background: #3465A4; text-decoration: none; }
.comment .wall-item-photo-menu-button { /*top: 44px;*/ top: 64px;} .comment .wall-item-photo-menu-button { /*top: 44px;*/ top: 34px;}
.comment .wall-item-photo-menu { /*top: 60px;*/ top: 80px; } .comment .wall-item-photo-menu { /*top: 60px;*/ top: 50px; }
.wallwall .wwto { .wallwall .wwto {
left: 50px; left: 50px;
@ -1201,9 +1203,6 @@ input#dfrn-url {
top: 70px; top: 70px;
z-index: 100; z-index: 100;
} }
.wall-item-wrapper {
margin-left:10px;
}
.wall-item-lock { .wall-item-lock {
margin-top: 30px; margin-top: 30px;
left: 105px; left: 105px;
@ -1212,6 +1211,7 @@ input#dfrn-url {
} }
.comment .wall-item-lock { .comment .wall-item-lock {
left: 65px; left: 65px;
margin-top: 0px;
} }
.wall-item-ago { .wall-item-ago {
@ -1349,6 +1349,7 @@ input#dfrn-url {
.wall-item-body { .wall-item-body {
text-align: justify; text-align: justify;
float: left; float: left;
clear: left;
/*width: 450px;*/ /*width: 450px;*/
width: 100%; width: 100%;
margin-top: 10px; margin-top: 10px;
@ -1364,28 +1365,23 @@ input#dfrn-url {
.wall-item-tools { .wall-item-tools {
clear: both; clear: both;
/* background-image: url("head.jpg");
background-position: 0 -20px;
background-repeat: repeat-x;*/
margin-top: 10px; margin-top: 10px;
margin-left: 0px; margin-left: 0px;
margin-bottom: 7px; padding: 10px 10px 0px 2px;
/* padding: 5px 10px 0px;*/
padding: 5px 10px 0px 2px; height: 22px;
height: 28px;
border-bottom: 1px solid #ddd; border-bottom: 1px solid #ddd;
} }
.wall-item-author { .wall-item-author {
/* margin-top: 10px;*/
margin-top: 0px; margin-top: 0px;
} }
.comment .wall-item-tools { .comment .wall-item-tools {
/* background:none;*/
/* background-image: url("head.jpg");
background-position: 0 -20px;
background-repeat: repeat-x;*/
margin-left: 0px; margin-left: 0px;
margin-top: 0px;
padding-top: 0px;
} }
.comment-edit-wrapper { .comment-edit-wrapper {
@ -1398,7 +1394,7 @@ input#dfrn-url {
display: block; display: block;
margin-top: 15px; margin-top: 15px;
background: #f3f3f3; background: #f3f3f3;
margin-left: 50px; margin-left: 75px;
} }
.comment-wwedit-wrapper.comment { .comment-wwedit-wrapper.comment {
@ -3098,6 +3094,11 @@ aside input[type='text'] {
margin-top: 10px; margin-top: 10px;
} }
.filesavetags, .categorytags {
display: block;
clear: left;
}
.body-tag, .filesavetags, .categorytags { .body-tag, .filesavetags, .categorytags {
opacity: 0.5; opacity: 0.5;
filter:alpha(opacity=50); filter:alpha(opacity=50);
@ -3121,8 +3122,20 @@ aside input[type='text'] {
} }
#item-delete-selected { #item-delete-selected-top {
margin-top: 30px; margin-top: 30px;
padding-bottom: 1.5em;
}
#item-delete-selected-top-icon, #item-delete-selected-top-desc {
float: left;
margin-right: 5px;
}
#item-delete-selected-top-desc:hover {
text-decoration: underline;
}
#item-delete-selected {
margin-top: 0px;
} }
#item-delete-selected-end { #item-delete-selected-end {

2
view/theme/frost/theme.php
View file

@ -4,7 +4,7 @@
* Name: Frost * Name: Frost
* Description: Like frosted glass * Description: Like frosted glass
* Credits: Navigation icons taken from http://iconza.com. Other icons taken from http://thenounproject.com, including: Like, Dislike, Black Lock, Unlock, Pencil, Tag, Camera, Paperclip (Marie Coons), Folder (Sergio Calcara), Chain-link (Andrew Fortnum), Speaker (Harold Kim), Quotes (Henry Ryder), Video Camera (Anas Ramadan), and Left Arrow, Right Arrow, and Delete X (all three P.J. Onori). All under Attribution (CC BY 3.0). Others from The Noun Project are public domain or No Rights Reserved (CC0). * Credits: Navigation icons taken from http://iconza.com. Other icons taken from http://thenounproject.com, including: Like, Dislike, Black Lock, Unlock, Pencil, Tag, Camera, Paperclip (Marie Coons), Folder (Sergio Calcara), Chain-link (Andrew Fortnum), Speaker (Harold Kim), Quotes (Henry Ryder), Video Camera (Anas Ramadan), and Left Arrow, Right Arrow, and Delete X (all three P.J. Onori). All under Attribution (CC BY 3.0). Others from The Noun Project are public domain or No Rights Reserved (CC0).
* Version: Version 0.2.12 * Version: Version 0.3
* Author: Zach P <techcity@f.shmuz.in> * Author: Zach P <techcity@f.shmuz.in>
* Maintainer: Zach P <techcity@f.shmuz.in> * Maintainer: Zach P <techcity@f.shmuz.in>
*/ */

22
view/theme/frost/threaded_conversation.tpl Normal file
View file

@ -0,0 +1,22 @@
{{ if $dropping }}
<div id="item-delete-selected-top" class="fakelink" onclick="deleteCheckedItems();">
<div id="item-delete-selected-top-icon" class="icon drophide" title="$dropping" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></div>
<div id="item-delete-selected-top-desc" >$dropping</div>
</div>
{{ endif }}
$live_update
{{ for $threads as $item }}
{{ inc $item.template }}{{ endinc }}
{{ endfor }}
<div id="conversation-end"></div>
{{ if $dropping }}
<div id="item-delete-selected" class="fakelink" onclick="deleteCheckedItems();">
<div id="item-delete-selected-icon" class="icon drophide" title="$dropping" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></div>
<div id="item-delete-selected-desc" >$dropping</div>
</div>
<div id="item-delete-selected-end"></div>
{{ endif }}