harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge https://github.com/friendica/red into zpull

Browse Source
This commit is contained in:
friendica
2012-12-28 17:29:41 -08:00
parent ddd58e6e28 096e370110
commit f048c1d05a
18 changed files with 166 additions and 282 deletions
Download Patch File Download Diff File Expand all files Collapse all files

93
view/theme/fancyred/css/style.css
View File

@@ -9,7 +9,6 @@ body {
font-family: helvetica,arial,freesans,clean,sans-serif;
font-size: 12px;
background-color: #ffffff;
background-image: url(../img/bg.png);
background-repeat: repeat;
color: #000000;
margin: 0px;
@@ -19,10 +18,10 @@ abbr {
border-bottom: none;
}
aside {box-shadow: 3px 3px 3px #ccc;
aside {
border: none;
border-radius: 0px 0px 20px 0px;
width: 210px;
width: 160px;
color: #d00;
background: #fff;
}
@@ -164,10 +163,9 @@ nav #site-location {
}
.info-message {
color: #204a87;
color: #fff;
font-size: 1.1em;
border: 1px solid #3465a4;
background-color: #d7e3f1;
background-color: #f00;
padding: 10px;
}
@@ -290,12 +288,12 @@ nav #nav-link-wrapper .nav-link {
}
.tab {
height: auto;
background-color: #fff;
color: #f00;
background-color: #f00;
color: #fff !important;
font-weight: bold;
-webkit-border-radius: 5px;
-moz-border-radius: 5px;
border-radius: 5px;
border-radius: 20px;
margin: 0;
width: auto;
box-shadow: 5px 5px 5px #444;
@@ -303,8 +301,8 @@ nav #nav-link-wrapper .nav-link {
padding: 4px;
}
.tab:hover, .tab.active:hover {
background: #fff;
color: #f00;
background: #d00;
color: #fff;
;
}
.tab:active {
@@ -312,16 +310,16 @@ nav #nav-link-wrapper .nav-link {
color: #f00;
}
.tab.active {
background: #fff;
color: #f00;
background: #f00;
color: #fff;
box-shadow: 3px 3px 3px #333 inset;
padding: 5px; /* another strageness of the human mind - has to be larger than inactive tabs, or it looks smaller than them */
}
.tab a {
.tab a, .settings-widget a {
border: 0;
text-decoration: none;
color: #f00;
color: #fff;
}
/* footer */
@@ -346,7 +344,6 @@ footer {
div.wall-item-content-wrapper.shiny {
opacity: 1;
border: none;
}
.preview {
@@ -439,9 +436,8 @@ div.wall-item-content-wrapper.shiny {
padding: 3px;
-moz-border-radius: 5px;
border-radius: 5px;
border: 1px solid #CCCCCC;
background: #F8F8F8;
font-weight: bold;
font-weight: bold;
color: #FFD700;
}
.fakelink:hover {
@@ -778,8 +774,8 @@ input#dfrn-url {
}
#profile-photo-wrapper img {
width:175px;
height:175px;
width:120px;
height:120px;
padding: 12px;
}
@@ -957,8 +953,18 @@ input#dfrn-url {
}
.settings-widget li {
margin-left: 24px;
margin-bottom: 8px;
height: auto;
background-color: #f00;
color: #fff !important;
font-weight: bold;
-webkit-border-radius: 5px;
-moz-border-radius: 5px;
border-radius: 5px;
margin-bottom: 12px;
width: auto;
box-shadow: 5px 5px 5px #444;
margin-left: 8px;
padding: 4px;
}
@@ -1049,8 +1055,8 @@ input#dfrn-url {
.wall-item-content-wrapper {
position: relative;
background: #fff;
border-radius: 20px;
box-shadow: 12px 12px 12px #111;
border-radius: 10px;
box-shadow: 8px 8px 8px #000;
border: 1px solid #eec;
opacity: 0.8;
}
@@ -1073,6 +1079,7 @@ input#dfrn-url {
background: #fff;
border-left: 1px solid #e0e0e0;
margin-left: 50px;
margin-top: 15px;
box-shadow: 5px 5px 5px #222;
}
@@ -1195,10 +1202,7 @@ input#dfrn-url {
}
.wall-item-delete-wrapper {
/* TODO
This should really go somewhere at the right, but for now, that leaves
it dangling at the edge of whitespace, so we'll put it with the other wall item tools for the time being */
float: left;
float: right;
}
.wall-item-delete-end {
@@ -1225,7 +1229,6 @@ input#dfrn-url {
height: 50px !important;
}
.wall-item-content {
float: left;
margin-left: 10px;
overflow: auto;
}
@@ -1283,6 +1286,7 @@ width: 90%;
/* float: left; */
/*width: 450px;*/
margin-top: 10px;
margin-right: 10px;
}
.wall-item-tools {
@@ -1292,12 +1296,18 @@ width: 90%;
background-repeat: repeat-x;
background: #eee;
padding: 5px 10px;
border-radius: 0px 0px 20px 20px;
border-radius: 0px 0px 10px 10px;
border: 1px #eec solid;
}
.wall-item-like {
margin: 15px;
opacity: 0.6;
}
.wall-item-like:hover {
margin: 15px;
opacity: 1;
}
.wall-item-author {
@@ -1840,7 +1850,7 @@ tr.mceLast {
height: 20px;
color:#000;
border: 1px solid #cccccc;
padding: 8px;
padding: 10px;
width: 90%;
border-radius: 20px;
box-shadow: 4px 4px 3px 0 #666 inset;
@@ -1919,12 +1929,6 @@ tr.mceLast {
box-shadow: 0 0 0 0;
}
.settings-widget .selected {
border-radius: 5px;
-moz-border-radius: 5px;
box-shadow: 4px 4px 3px 0 #444444;
}
#sidebar-page-list .label {
margin-left: 5px;
}
@@ -2641,8 +2645,8 @@ aside input[type='text'] {
float: left;
}
.contact-block-img {
width:48px;
height:48px;
width:30px;
height:30px;
}
#tag-remove {
@@ -3656,7 +3660,7 @@ nav {
background-image: linear-gradient(bottom, #f00 26%, #b00 82%);
background-image: -o-linear-gradient(bottom, #f00 26%, #b00 82%);
background-image: -moz-linear-gradient(bottom, #f00 26%, #b00 82%);
background-image: -moz-linear-gradient(bottom, #000 26%, #2e2f2e 82%);
background-image: -webkit-linear-gradient(bottom, #f00 26%, #b00 82%);
background-image: -ms-linear-gradient(bottom, #f00 26%, #b00 82%);
@@ -3715,12 +3719,12 @@ nav .nav-menu {
position: relative;
height: 16px;
padding: 5px;
margin: 3px 15px 0px;
margin: 0px 15px;
font-size: 14px;
border-bottom: 3px solid #d00;
}
nav .nav-menu.selected {
border-bottom: 4px solid #CCCCCC;
border-bottom: 3px solid #f00;
}
nav .nav-notify {
background-color: #0d0;
@@ -3777,6 +3781,7 @@ ul.menu-popup a {
}
ul.menu-popup a:hover {
background-color: #eec;
color: #f00;
}
ul.menu-popup .menu-sep {
border-top: 1px solid #9eabb0;

117
view/theme/fancyred/tpl/conv_item.tpl Normal file
View File

@@ -0,0 +1,117 @@
{{if $item.comment_firstcollapsed}}
<div class="hide-comments-outer">
<span id="hide-comments-total-$item.id" class="hide-comments-total">$item.num_comments</span> <span id="hide-comments-$item.id" class="hide-comments fakelink" onclick="showHideComments($item.id);">$item.hide_text</span>
</div>
<div id="collapsed-comments-$item.id" class="collapsed-comments" style="display: none;">
{{endif}}
<div id="thread-wrapper-$item.id" class="thread-wrapper $item.toplevel">
<a name="$item.id" ></a>
<div class="wall-item-outside-wrapper $item.indent$item.previewing{{ if $item.owner_url }} wallwall{{ endif }}" id="wall-item-outside-wrapper-$item.id" >
<div class="wall-item-content-wrapper $item.indent" id="wall-item-content-wrapper-$item.id" >
<div class="wall-item-info{{ if $item.owner_url }} wallwall{{ endif }}" id="wall-item-info-$item.id">
{{ if $item.owner_url }}
<div class="wall-item-photo-wrapper wwto" id="wall-item-ownerphoto-wrapper-$item.id" >
<a href="$item.owner_url" title="$item.olinktitle" class="wall-item-photo-link" id="wall-item-ownerphoto-link-$item.id">
<img src="$item.owner_photo" class="wall-item-photo$item.osparkle" id="wall-item-ownerphoto-$item.id" style="height: 80px; width: 80px;" alt="$item.owner_name" /></a>
</div>
<div class="wall-item-arrowphoto-wrapper" ><img src="images/larrow.gif" alt="$item.wall" /></div>
{{ endif }}
<div class="wall-item-photo-wrapper{{ if $item.owner_url }} wwfrom{{ endif }}" id="wall-item-photo-wrapper-$item.id"
onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')"
onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">
<a href="$item.profile_url" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id">
<img src="$item.thumb" class="wall-item-photo$item.sparkle" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" /></a>
<span onclick="openClose('wall-item-photo-menu-$item.id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$item.id">menu</span>
<div class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id">
<ul>
$item.item_photo_menu
</ul>
</div>
</div>
<div class="wall-item-photo-end"></div>
<div class="wall-item-wrapper" id="wall-item-wrapper-$item.id" >
{{ if $item.lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$item.lock" onclick="lockview(event,$item.id);" /></div>
{{ else }}<div class="wall-item-lock"></div>{{ endif }}
<div class="wall-item-location" id="wall-item-location-$item.id">$item.location</div>
</div>
</div>
<div class="wall-item-author">
<a href="$item.profile_url" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span></a>{{ if $item.owner_url }} $item.to <a href="$item.owner_url" title="$item.olinktitle" class="wall-item-name-link"><span class="wall-item-name$item.osparkle" id="wall-item-ownername-$item.id">$item.owner_name</span></a> $item.vwall{{ endif }}<br />
<div class="wall-item-ago" id="wall-item-ago-$item.id" title="$item.localtime">$item.ago</div>
</div>
<div class="wall-item-content" id="wall-item-content-$item.id" >
<div class="wall-item-title" id="wall-item-title-$item.id">$item.title</div>
<div class="wall-item-title-end"></div>
<div class="wall-item-body" id="wall-item-body-$item.id" >$item.body
<div class="body-tag">
{{ for $item.tags as $tag }}
<span class='tag'>$tag</span>
{{ endfor }}
</div>
{{ if $item.has_cats }}
<div class="categorytags"><span>$item.txt_cats {{ for $item.categories as $cat }}$cat.name <a href="$cat.removeurl" title="$remove">[$remove]</a> {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }}
</div>
{{ endif }}
{{ if $item.has_folders }}
<div class="filesavetags"><span>$item.txt_folders {{ for $item.folders as $cat }}$cat.name <a href="$cat.removeurl" title="$remove">[$remove]</a> {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }}
</div>
{{ endif }}
</div>
</div>
<div class="wall-item-like $item.indent" id="wall-item-like-$item.id">$item.showlike</div>
<div class="wall-item-dislike $item.indent" id="wall-item-dislike-$item.id">$item.showdislike</div>
<div class="wall-item-tools" id="wall-item-tools-$item.id">
{{ if $item.like }}
<a href="#" class="icon like item-tool" title="$item.like.0" onclick="dolike($item.id,'like'); return false"></a>
{{ endif }}
{{ if $item.dislike }}
<a href="#" class="icon dislike item-tool" title="$item.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a>
{{ endif }}
{{ if $item.share }}
<a href="#" class="icon recycle item-tool" title="$item.share.0" onclick="jotShare($item.id); return false"></a>
{{ endif }}
{{ if $item.plink }}
<a href="$item.plink.href" title="$item.plink.title" target="external-link" class="icon item-tool remote-link$item.sparkle"></a>
{{ endif }}
{{ if $item.edpost }}
<a class="editpost icon pencil item-tool" href="$item.edpost.0" title="$item.edpost.1"></a>
{{ endif }}
{{ if $item.star }}
<a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon item-tool $item.star.isstarred" title="$item.star.toggle"></a>
{{ endif }}
{{ if $item.tagger }}
<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon item-tool tagged" title="$item.tagger.tagit"></a>
{{ endif }}
{{ if $item.filer }}
<a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item filer-icon item-tool" title="$item.filer"></a>
{{ endif }}
<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >
{{ if $item.drop.dropping }}<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
</div>
{{ if $item.drop.pagedrop }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />{{ endif }}
<div class="wall-item-delete-end"></div>
</div>
</div>
<div class="wall-item-wrapper-end"></div>
<div class="wall-item-outside-wrapper-end $item.indent" ></div>
</div>
{{ if $item.toplevel }}
{{ for $item.children as $item }}
{{ inc $item.template }}{{ endinc }}
{{ endfor }}
{{ endif }}
<div class="wall-item-comment-wrapper" >
$item.comment
</div>
</div>
{{if $item.comment_lastcollapsed}}</div>{{endif}}

11
view/tpl/diaspora_comment.tpl
View File

@@ -1,11 +0,0 @@
<XML>
<post>
<comment>
<guid>$guid</guid>
<parent_guid>$parent_guid</parent_guid>
<author_signature>$authorsig</author_signature>
<text>$body</text>
<diaspora_handle>$handle</diaspora_handle>
</comment>
</post>
</XML>

12
view/tpl/diaspora_comment_relay.tpl
View File

@@ -1,12 +0,0 @@
<XML>
<post>
<comment>
<guid>$guid</guid>
<parent_guid>$parent_guid</parent_guid>
<parent_author_signature>$parentsig</parent_author_signature>
<author_signature>$authorsig</author_signature>
<text>$body</text>
<diaspora_handle>$handle</diaspora_handle>
</comment>
</post>
</XML>

29
view/tpl/diaspora_conversation.tpl
View File

@@ -1,29 +0,0 @@
<XML>
<post>
<conversation>
<guid>$conv.guid</guid>
<subject>$conv.subject</subject>
<created_at>$conv.created_at</created_at>
{{ for $conv.messages as $msg }}
<message>
<guid>$msg.guid</guid>
<parent_guid>$msg.parent_guid</parent_guid>
{{ if $msg.parent_author_signature }}
<parent_author_signature>$msg.parent_author_signature</parent_author_signature>
{{ endif }}
<author_signature>$msg.author_signature</author_signature>
<text>$msg.text</text>
<created_at>$msg.created_at</created_at>
<diaspora_handle>$msg.diaspora_handle</diaspora_handle>
<conversation_guid>$msg.conversation_guid</conversation_guid>
</message>
{{ endfor }}
<diaspora_handle>$conv.diaspora_handle</diaspora_handle>
<participant_handles>$conv.participant_handles</participant_handles>
</conversation>
</post>
</XML>

12
view/tpl/diaspora_like.tpl
View File

@@ -1,12 +0,0 @@
<XML>
<post>
<like>
<target_type>$target_type</target_type>
<guid>$guid</guid>
<parent_guid>$parent_guid</parent_guid>
<author_signature>$authorsig</author_signature>
<positive>$positive</positive>
<diaspora_handle>$handle</diaspora_handle>
</like>
</post>
</XML>

13
view/tpl/diaspora_like_relay.tpl
View File

@@ -1,13 +0,0 @@
<XML>
<post>
<like>
<guid>$guid</guid>
<target_type>$target_type</target_type>
<parent_guid>$parent_guid</parent_guid>
<parent_author_signature>$parentsig</parent_author_signature>
<author_signature>$authorsig</author_signature>
<positive>$positive</positive>
<diaspora_handle>$handle</diaspora_handle>
</like>
</post>
</XML>

13
view/tpl/diaspora_message.tpl
View File

@@ -1,13 +0,0 @@
<XML>
<post>
<message>
<guid>$msg.guid</guid>
<parent_guid>$msg.parent_guid</parent_guid>
<author_signature>$msg.author_signature</author_signature>
<text>$msg.text</text>
<created_at>$msg.created_at</created_at>
<diaspora_handle>$msg.diaspora_handle</diaspora_handle>
<conversation_guid>$msg.conversation_guid</conversation_guid>
</message>
</post>
</XML>

13
view/tpl/diaspora_photo.tpl
View File

@@ -1,13 +0,0 @@
<XML>
<post>
<photo>
<remote_photo_path>$path</remote_photo_path>
<remote_photo_name>$filename</remote_photo_name>
<status_message_guid>$msg_guid</status_message_guid>
<guid>$guid</guid>
<diaspora_handle>$handle</diaspora_handle>
<public>$public</public>
<created_at>$created_at</created_at>
</photo>
</post>
</XML>

11
view/tpl/diaspora_post.tpl
View File

@@ -1,11 +0,0 @@
<XML>
<post>
<status_message>
<raw_message>$body</raw_message>
<guid>$guid</guid>
<diaspora_handle>$handle</diaspora_handle>
<public>$public</public>
<created_at>$created</created_at>
</status_message>
</post>
</XML>

16
view/tpl/diaspora_profile.tpl
View File

@@ -1,16 +0,0 @@
<XML>
<post><profile>
<diaspora_handle>$handle</diaspora_handle>
<first_name>$first</first_name>
<last_name>$last</last_name>
<image_url>$large</image_url>
<image_url_small>$small</image_url_small>
<image_url_medium>$medium</image_url_medium>
<birthday>$dob</birthday>
<gender>$gender</gender>
<bio>$about</bio>
<location>$location</location>
<searchable>$searchable</searchable>
<tag_string>$tags</tag_string>
</profile></post>
</XML>

10
view/tpl/diaspora_relay_retraction.tpl
View File

@@ -1,10 +0,0 @@
<XML>
<post>
<relayable_retraction>
<target_type>$type</target_type>
<target_guid>$guid</target_guid>
<target_author_signature>$signature</target_author_signature>
<sender_handle>$handle</sender_handle>
</relayable_retraction>
</post>
</XML>

11
view/tpl/diaspora_relayable_retraction.tpl
View File

@@ -1,11 +0,0 @@
<XML>
<post>
<relayable_retraction>
<target_type>$target_type</target_type>
<target_guid>$guid</target_guid>
<parent_author_signature>$parentsig</parent_author_signature>
<target_author_signature>$authorsig</target_author_signature>
<sender_handle>$handle</sender_handle>
</relayable_retraction>
</post>
</XML>

9
view/tpl/diaspora_retract.tpl
View File

@@ -1,9 +0,0 @@
<XML>
<post>
<retraction>
<post_guid>$guid</post_guid>
<type>$type</type>
<diaspora_handle>$handle</diaspora_handle>
</retraction>
</post>
</XML>

8
view/tpl/diaspora_share.tpl
View File

@@ -1,8 +0,0 @@
<XML>
<post>
<request>
<sender_handle>$sender</sender_handle>
<recipient_handle>$recipient</recipient_handle>
</request>
</post>
</XML>

10
view/tpl/diaspora_signed_retract.tpl
View File

@@ -1,10 +0,0 @@
<XML>
<post>
<signed_retraction>
<target_guid>$guid</target_guid>
<target_type>$type</target_type>
<sender_handle>$handle</sender_handle>
<target_author_signature>$signature</target_author_signature>
</signed_retraction>
</post>
</XML>

57
view/tpl/diaspora_vcard.tpl
View File

@@ -1,57 +0,0 @@
<div style="display:none;">
<dl class='channel_nickname'>
<dt>Nickname</dt>
<dd>
<a class="nickname url uid" href="$diaspora.podloc/" rel="me">$diaspora.nickname</a>
</dd>
</dl>
<dl class='channel_fn'>
<dt>Full name</dt>
<dd>
<span class='fn'>$diaspora.fullname</span>
</dd>
</dl>
<dl class='channel_given_name'>
<dt>First name</dt>
<dd>
<span class='given_name'>$diaspora.firstname</span>
</dd>
</dl>
<dl class='channel_family_name'>
<dt>Family name</dt>
<dd>
<span class='family_name'>$diaspora.lastname</span>
</dd>
</dl>
<dl class="channel_url">
<dt>URL</dt>
<dd>
<a class="url" href="$diaspora.podloc/" id="pod_location" rel="me">$diaspora.podloc/</a>
</dd>
</dl>
<dl class="channel_photo">
<dt>Photo</dt>
<dd>
<img class="photo avatar" height="300" width="300" src="$diaspora.photo300">
</dd>
</dl>
<dl class="channel_photo_medium">
<dt>Photo</dt>
<dd>
<img class="photo avatar" height="100" width="100" src="$diaspora.photo100">
</dd>
</dl>
<dl class="channel_photo_small">
<dt>Photo</dt>
<dd>
<img class="photo avatar" height="50" width="50" src="$diaspora.photo50">
</dd>
</dl>
<dl class="channel_searchable">
<dt>Searchable</dt>
<dd>
<span class="searchable">$diaspora.searchable</span>
</dd>
</dl>
</div>

3
view/tpl/xrd_diaspora.tpl
View File

@@ -1,3 +0,0 @@
<Link rel="http://joindiaspora.com/seed_location" type="text/html" href="$baseurl/" />
<Link rel="http://joindiaspora.com/guid" type="text/html" href="$dspr_guid" />
<Link rel="diaspora-public-key" type="RSA" href="$dspr_key" />