friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

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

Conflicts:
	view/admin_site.tpl
This commit is contained in:
friendica 2012-12-22 23:02:21 -08:00
parent 453082516e b0759e9a9f
commit a29842e301
14 changed files with 236 additions and 285 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htconfig.php
View File

@ -92,5 +92,5 @@ $a->config['system']['lockpath'] = "";
// If enabled, the MyBB fulltext engine is used // If enabled, the MyBB fulltext engine is used
// $a->config['system']['use_fulltext_engine'] = true; // $a->config['system']['use_fulltext_engine'] = true;
// Let reshared messages look like wall-to-wall posts // Use the new "share" element
// $a->config['system']['diaspora_newreshare'] = true; // $a->config['system']['new_share'] = true;

14
include/bbcode.php
View File

@ -3,6 +3,14 @@
require_once("include/oembed.php"); require_once("include/oembed.php");
require_once('include/event.php'); require_once('include/event.php');
function bb_cleanstyle($st) {
return "<span style=\"".cleancss($st[1]).";\">".$st[2]."</span>";
}
function bb_cleanclass($st) {
return "<span class=\"".cleancss($st[1])."\">".$st[2]."</span>";
}
function cleancss($input) { function cleancss($input) {
$cleaned = ""; $cleaned = "";
@ -213,7 +221,7 @@ function bb_ShareAttributes($match) {
$author = ""; $author = "";
preg_match("/author='(.*?)'/ism", $attributes, $matches); preg_match("/author='(.*?)'/ism", $attributes, $matches);
if ($matches[1] != "") if ($matches[1] != "")
$author = $matches[1]; $author = html_entity_decode($matches[1],ENT_QUOTES,'UTF-8');
preg_match('/author="(.*?)"/ism', $attributes, $matches); preg_match('/author="(.*?)"/ism', $attributes, $matches);
if ($matches[1] != "") if ($matches[1] != "")
@ -385,10 +393,10 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) {
$Text = str_replace("[*]", "<li>", $Text); $Text = str_replace("[*]", "<li>", $Text);
// Check for style sheet commands // Check for style sheet commands
$Text = preg_replace("(\[style=(.*?)\](.*?)\[\/style\])ism","<span style=\"$1;\">$2</span>",$Text); $Text = preg_replace_callback("(\[style=(.*?)\](.*?)\[\/style\])ism","bb_cleanstyle",$Text);
// Check for CSS classes // Check for CSS classes
$Text = preg_replace("(\[class=(.*?)\](.*?)\[\/class\])ism","<span class=\"$1\">$2</span>",$Text); $Text = preg_replace_callback("(\[class=(.*?)\](.*?)\[\/class\])ism","bb_cleanclass",$Text);
// handle nested lists // handle nested lists
$endlessloop = 0; $endlessloop = 0;

24
include/diaspora.php
View File

@ -960,12 +960,12 @@ function diaspora_reshare($importer,$xml,$msg) {
$person = find_diaspora_person_by_handle($orig_author); $person = find_diaspora_person_by_handle($orig_author);
if(is_array($person) && x($person,'name') && x($person,'url')) /*if(is_array($person) && x($person,'name') && x($person,'url'))
$details = '[url=' . $person['url'] . ']' . $person['name'] . '[/url]'; $details = '[url=' . $person['url'] . ']' . $person['name'] . '[/url]';
else else
$details = $orig_author; $details = $orig_author;
$prefix = html_entity_decode("&#x2672; ", ENT_QUOTES, 'UTF-8') . $details . "\n"; $prefix = html_entity_decode("&#x2672; ", ENT_QUOTES, 'UTF-8') . $details . "\n";*/
// allocate a guid on our system - we aren't fixing any collisions. // allocate a guid on our system - we aren't fixing any collisions.
@ -1012,7 +1012,7 @@ function diaspora_reshare($importer,$xml,$msg) {
} }
} }
} }
$datarray['uid'] = $importer['uid']; $datarray['uid'] = $importer['uid'];
$datarray['contact-id'] = $contact['id']; $datarray['contact-id'] = $contact['id'];
$datarray['wall'] = 0; $datarray['wall'] = 0;
@ -1024,16 +1024,8 @@ function diaspora_reshare($importer,$xml,$msg) {
$datarray['owner-name'] = $contact['name']; $datarray['owner-name'] = $contact['name'];
$datarray['owner-link'] = $contact['url']; $datarray['owner-link'] = $contact['url'];
$datarray['owner-avatar'] = ((x($contact,'thumb')) ? $contact['thumb'] : $contact['photo']); $datarray['owner-avatar'] = ((x($contact,'thumb')) ? $contact['thumb'] : $contact['photo']);
if (intval(get_config('system','diaspora_newreshare'))) { if (intval(get_config('system','new_share'))) {
// Let reshared messages look like wall-to-wall posts $prefix = "[share author='".str_replace("'", "&#039;",$person['name']).
// we have to set an additional value in the item in the future
// to distinct the wall-to-wall-posts from reshared/repeated messages
$datarray['author-name'] = $person['name'];
$datarray['author-link'] = $person['url'];
$datarray['author-avatar'] = ((x($person,'thumb')) ? $person['thumb'] : $person['photo']);
$datarray['body'] = $body;
} else {
$prefix = "[share author='".$person['name'].
"' profile='".$person['url']. "' profile='".$person['url'].
"' avatar='".((x($person,'thumb')) ? $person['thumb'] : $person['photo']). "' avatar='".((x($person,'thumb')) ? $person['thumb'] : $person['photo']).
"' link='".$orig_url."']"; "' link='".$orig_url."']";
@ -1041,6 +1033,12 @@ function diaspora_reshare($importer,$xml,$msg) {
$datarray['author-link'] = $contact['url']; $datarray['author-link'] = $contact['url'];
$datarray['author-avatar'] = $contact['thumb']; $datarray['author-avatar'] = $contact['thumb'];
$datarray['body'] = $prefix.$body."[/share]"; $datarray['body'] = $prefix.$body."[/share]";
} else {
// Let reshared messages look like wall-to-wall posts
$datarray['author-name'] = $person['name'];
$datarray['author-link'] = $person['url'];
$datarray['author-avatar'] = ((x($person,'thumb')) ? $person['thumb'] : $person['photo']);
$datarray['body'] = $body;
} }
$datarray['tag'] = $str_tags; $datarray['tag'] = $str_tags;

26
include/items.php
View File

@ -808,20 +808,24 @@ function get_atom_elements($feed,$item) {
if (($name != "") and ($uri != "") and ($avatar != "") and ($message != "")) { if (($name != "") and ($uri != "") and ($avatar != "") and ($message != "")) {
logger('get_atom_elements: fixing sender of repeated message.'); logger('get_atom_elements: fixing sender of repeated message.');
/*$res["owner-name"] = $res["author-name"]; if (intval(get_config('system','new_share'))) {
$res["owner-link"] = $res["author-link"]; $prefix = "[share author='".str_replace("'", "&#039;",$name).
$res["owner-avatar"] = $res["author-avatar"]; "' profile='".$uri.
"' avatar='".$avatar.
"' link='".$orig_uri."']";
$res["author-name"] = $name; $res["body"] = $prefix.html2bbcode($message)."[/share]";
$res["author-link"] = $uri; } else {
$res["author-avatar"] = $avatar;*/ $res["owner-name"] = $res["author-name"];
$res["owner-link"] = $res["author-link"];
$res["owner-avatar"] = $res["author-avatar"];
$prefix = "[share author='".$name. $res["author-name"] = $name;
"' profile='".$uri. $res["author-link"] = $uri;
"' avatar='".$avatar. $res["author-avatar"] = $avatar;
"' link='".$orig_uri."']";
$res["body"] = $prefix.html2bbcode($message)."[/share]"; $res["body"] = html2bbcode($message);
}
} }
} }

5
include/onepoll.php
View File

@ -398,14 +398,15 @@ function onepoll_run(&$argv, &$argc){
// Is it a reply? // Is it a reply?
$reply = ((substr(strtolower($datarray['title']), 0, 3) == "re:") or $reply = ((substr(strtolower($datarray['title']), 0, 3) == "re:") or
(substr(strtolower($datarray['title']), 0, 3) == "re-") or (substr(strtolower($datarray['title']), 0, 3) == "re-") or
(raw_refs != "")); ($raw_refs != ""));
// Remove Reply-signs in the subject // Remove Reply-signs in the subject
$datarray['title'] = RemoveReply($datarray['title']); $datarray['title'] = RemoveReply($datarray['title']);
// If it seems to be a reply but a header couldn't be found take the last message with matching subject // If it seems to be a reply but a header couldn't be found take the last message with matching subject
if(!x($datarray,'parent-uri') and $reply) { if(!x($datarray,'parent-uri') and $reply) {
$r = q("SELECT `uri` , `parent-uri` FROM `item` WHERE MATCH (`title`) AGAINST ('".'"%s"'."' IN BOOLEAN MODE) AND `uid` = %d ORDER BY `created` DESC LIMIT 1", //$r = q("SELECT `uri` , `parent-uri` FROM `item` WHERE MATCH (`title`) AGAINST ('".'"%s"'."' IN BOOLEAN MODE) AND `uid` = %d ORDER BY `created` DESC LIMIT 1",
$r = q("SELECT `uri` , `parent-uri` FROM `item` WHERE `title` = \"%s\" AND `uid` = %d ORDER BY `created` DESC LIMIT 1",
dbesc(protect_sprintf($datarray['title'])), dbesc(protect_sprintf($datarray['title'])),
intval($importer_uid)); intval($importer_uid));
if(count($r)) if(count($r))

42
mod/admin.php
View File

@ -241,14 +241,14 @@ function admin_page_site_post(&$a){
$maximagesize = ((x($_POST,'maximagesize')) ? intval(trim($_POST['maximagesize'])) : 0); $maximagesize = ((x($_POST,'maximagesize')) ? intval(trim($_POST['maximagesize'])) : 0);
$maximagelength = ((x($_POST,'maximagelength')) ? intval(trim($_POST['maximagelength'])) : MAX_IMAGE_LENGTH); $maximagelength = ((x($_POST,'maximagelength')) ? intval(trim($_POST['maximagelength'])) : MAX_IMAGE_LENGTH);
$jpegimagequality = ((x($_POST,'jpegimagequality')) ? intval(trim($_POST['jpegimagequality'])) : JPEG_QUALITY); $jpegimagequality = ((x($_POST,'jpegimagequality')) ? intval(trim($_POST['jpegimagequality'])) : JPEG_QUALITY);
$register_policy = ((x($_POST,'register_policy')) ? intval(trim($_POST['register_policy'])) : 0); $register_policy = ((x($_POST,'register_policy')) ? intval(trim($_POST['register_policy'])) : 0);
$daily_registrations = ((x($_POST,'max_daily_registrations')) ? intval(trim($_POST['max_daily_registrations'])) :0); $daily_registrations = ((x($_POST,'max_daily_registrations')) ? intval(trim($_POST['max_daily_registrations'])) :0);
$abandon_days = ((x($_POST,'abandon_days')) ? intval(trim($_POST['abandon_days'])) : 0); $abandon_days = ((x($_POST,'abandon_days')) ? intval(trim($_POST['abandon_days'])) : 0);
$register_text = ((x($_POST,'register_text')) ? notags(trim($_POST['register_text'])) : ''); $register_text = ((x($_POST,'register_text')) ? notags(trim($_POST['register_text'])) : '');
$allowed_sites = ((x($_POST,'allowed_sites')) ? notags(trim($_POST['allowed_sites'])) : ''); $allowed_sites = ((x($_POST,'allowed_sites')) ? notags(trim($_POST['allowed_sites'])) : '');
$allowed_email = ((x($_POST,'allowed_email')) ? notags(trim($_POST['allowed_email'])) : ''); $allowed_email = ((x($_POST,'allowed_email')) ? notags(trim($_POST['allowed_email'])) : '');
$block_public = ((x($_POST,'block_public')) ? True : False); $block_public = ((x($_POST,'block_public')) ? True : False);
@ -273,6 +273,13 @@ function admin_page_site_post(&$a){
$ostatus_disabled = !((x($_POST,'ostatus_disabled')) ? True : False); $ostatus_disabled = !((x($_POST,'ostatus_disabled')) ? True : False);
$diaspora_enabled = ((x($_POST,'diaspora_enabled')) ? True : False); $diaspora_enabled = ((x($_POST,'diaspora_enabled')) ? True : False);
$ssl_policy = ((x($_POST,'ssl_policy')) ? intval($_POST['ssl_policy']) : 0); $ssl_policy = ((x($_POST,'ssl_policy')) ? intval($_POST['ssl_policy']) : 0);
$new_share = ((x($_POST,'new_share')) ? True : False);
$use_fulltext_engine = ((x($_POST,'use_fulltext_engine')) ? True : False);
$itemcache = ((x($_POST,'itemcache')) ? notags(trim($_POST['itemcache'])) : '');
$itemcache_duration = ((x($_POST,'itemcache_duration')) ? intval($_POST['itemcache_duration']) : 0);
$lockpath = ((x($_POST,'lockpath')) ? notags(trim($_POST['lockpath'])) : '');
$temppath = ((x($_POST,'temppath')) ? notags(trim($_POST['temppath'])) : '');
$basepath = ((x($_POST,'basepath')) ? notags(trim($_POST['basepath'])) : '');
if($ssl_policy != intval(get_config('system','ssl_policy'))) { if($ssl_policy != intval(get_config('system','ssl_policy'))) {
if($ssl_policy == SSL_POLICY_FULL) { if($ssl_policy == SSL_POLICY_FULL) {
@ -372,10 +379,19 @@ function admin_page_site_post(&$a){
set_config('system','ostatus_disabled', $ostatus_disabled); set_config('system','ostatus_disabled', $ostatus_disabled);
set_config('system','diaspora_enabled', $diaspora_enabled); set_config('system','diaspora_enabled', $diaspora_enabled);
set_config('system','new_share', $new_share);
set_config('system','use_fulltext_engine', $use_fulltext_engine);
set_config('system','itemcache', $itemcache);
set_config('system','itemcache_duration', $itemcache_duration);
set_config('system','lockpath', $lockpath);
set_config('system','temppath', $temppath);
set_config('system','basepath', $basepath);
info( t('Site settings updated.') . EOL); info( t('Site settings updated.') . EOL);
goaway($a->get_baseurl(true) . '/admin/site' ); goaway($a->get_baseurl(true) . '/admin/site' );
return; // NOTREACHED return; // NOTREACHED
} }
/** /**
@ -456,6 +472,7 @@ function admin_page_site(&$a) {
'$upload' => t('File upload'), '$upload' => t('File upload'),
'$corporate' => t('Policies'), '$corporate' => t('Policies'),
'$advanced' => t('Advanced'), '$advanced' => t('Advanced'),
'$performance' => t('Performance'),
'$baseurl' => $a->get_baseurl(true), '$baseurl' => $a->get_baseurl(true),
// name, label, value, help string, extra data... // name, label, value, help string, extra data...
@ -465,6 +482,7 @@ function admin_page_site(&$a) {
'$theme' => array('theme', t("System theme"), get_config('system','theme'), t("Default system theme - may be over-ridden by user profiles - <a href='#' id='cnftheme'>change theme settings</a>"), $theme_choices), '$theme' => array('theme', t("System theme"), get_config('system','theme'), t("Default system theme - may be over-ridden by user profiles - <a href='#' id='cnftheme'>change theme settings</a>"), $theme_choices),
'$theme_mobile' => array('theme_mobile', t("Mobile system theme"), get_config('system','mobile-theme'), t("Theme for mobile devices"), $theme_choices_mobile), '$theme_mobile' => array('theme_mobile', t("Mobile system theme"), get_config('system','mobile-theme'), t("Theme for mobile devices"), $theme_choices_mobile),
'$ssl_policy' => array('ssl_policy', t("SSL link policy"), (string) intval(get_config('system','ssl_policy')), t("Determines whether generated links should be forced to use SSL"), $ssl_choices), '$ssl_policy' => array('ssl_policy', t("SSL link policy"), (string) intval(get_config('system','ssl_policy')), t("Determines whether generated links should be forced to use SSL"), $ssl_choices),
'$new_share' => array('new_share', t("'Share' element"), get_config('system','new_share'), t("Activates the bbcode element 'share' for repeating items.")),
'$maximagesize' => array('maximagesize', t("Maximum image size"), get_config('system','maximagesize'), t("Maximum size in bytes of uploaded images. Default is 0, which means no limits.")), '$maximagesize' => array('maximagesize', t("Maximum image size"), get_config('system','maximagesize'), t("Maximum size in bytes of uploaded images. Default is 0, which means no limits.")),
'$maximagelength' => array('maximagelength', t("Maximum image length"), get_config('system','max_image_length'), t("Maximum length in pixels of the longest side of uploaded images. Default is -1, which means no limits.")), '$maximagelength' => array('maximagelength', t("Maximum image length"), get_config('system','max_image_length'), t("Maximum length in pixels of the longest side of uploaded images. Default is -1, which means no limits.")),
'$jpegimagequality' => array('jpegimagequality', t("JPEG image quality"), get_config('system','jpeg_quality'), t("Uploaded JPEGS will be saved at this quality setting [0-100]. Default is 100, which is full quality.")), '$jpegimagequality' => array('jpegimagequality', t("JPEG image quality"), get_config('system','jpeg_quality'), t("Uploaded JPEGS will be saved at this quality setting [0-100]. Default is 100, which is full quality.")),
@ -480,7 +498,7 @@ function admin_page_site(&$a) {
'$global_directory' => array('directory_submit_url', t("Global directory update URL"), get_config('system','directory_submit_url'), t("URL to update the global directory. If this is not set, the global directory is completely unavailable to the application.")), '$global_directory' => array('directory_submit_url', t("Global directory update URL"), get_config('system','directory_submit_url'), t("URL to update the global directory. If this is not set, the global directory is completely unavailable to the application.")),
'$thread_allow' => array('thread_allow', t("Allow threaded items"), get_config('system','thread_allow'), t("Allow infinite level threading for items on this site.")), '$thread_allow' => array('thread_allow', t("Allow threaded items"), get_config('system','thread_allow'), t("Allow infinite level threading for items on this site.")),
'$newuser_private' => array('newuser_private', t("Private posts by default for new users"), get_config('system','newuser_private'), t("Set default post permissions for all new members to the default privacy group rather than public.")), '$newuser_private' => array('newuser_private', t("Private posts by default for new users"), get_config('system','newuser_private'), t("Set default post permissions for all new members to the default privacy group rather than public.")),
'$no_multi_reg' => array('no_multi_reg', t("Block multiple registrations"), get_config('system','block_extended_register'), t("Disallow users to register additional accounts for use as pages.")), '$no_multi_reg' => array('no_multi_reg', t("Block multiple registrations"), get_config('system','block_extended_register'), t("Disallow users to register additional accounts for use as pages.")),
'$no_openid' => array('no_openid', t("OpenID support"), !get_config('system','no_openid'), t("OpenID support for registration and logins.")), '$no_openid' => array('no_openid', t("OpenID support"), !get_config('system','no_openid'), t("OpenID support for registration and logins.")),
'$no_regfullname' => array('no_regfullname', t("Fullname check"), !get_config('system','no_regfullname'), t("Force users to register with a space between firstname and lastname in Full name, as an antispam measure")), '$no_regfullname' => array('no_regfullname', t("Fullname check"), !get_config('system','no_regfullname'), t("Force users to register with a space between firstname and lastname in Full name, as an antispam measure")),
@ -496,6 +514,14 @@ function admin_page_site(&$a) {
'$delivery_interval' => array('delivery_interval', t("Delivery interval"), (x(get_config('system','delivery_interval'))?get_config('system','delivery_interval'):2), t("Delay background delivery processes by this many seconds to reduce system load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 for large dedicated servers.")), '$delivery_interval' => array('delivery_interval', t("Delivery interval"), (x(get_config('system','delivery_interval'))?get_config('system','delivery_interval'):2), t("Delay background delivery processes by this many seconds to reduce system load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 for large dedicated servers.")),
'$poll_interval' => array('poll_interval', t("Poll interval"), (x(get_config('system','poll_interval'))?get_config('system','poll_interval'):2), t("Delay background polling processes by this many seconds to reduce system load. If 0, use delivery interval.")), '$poll_interval' => array('poll_interval', t("Poll interval"), (x(get_config('system','poll_interval'))?get_config('system','poll_interval'):2), t("Delay background polling processes by this many seconds to reduce system load. If 0, use delivery interval.")),
'$maxloadavg' => array('maxloadavg', t("Maximum Load Average"), ((intval(get_config('system','maxloadavg')) > 0)?get_config('system','maxloadavg'):50), t("Maximum system load before delivery and poll processes are deferred - default 50.")), '$maxloadavg' => array('maxloadavg', t("Maximum Load Average"), ((intval(get_config('system','maxloadavg')) > 0)?get_config('system','maxloadavg'):50), t("Maximum system load before delivery and poll processes are deferred - default 50.")),
'$use_fulltext_engine' => array('use_fulltext_engine', t("Use MySQL full text engine"), get_config('system','use_fulltext_engine'), t("Activates the full text engine. Speeds up search - but can only search for four and more characters.")),
'$itemcache' => array('itemcache', t("Path to item cache"), get_config('system','itemcache'), "The item caches buffers generated bbcode and external images."),
'$itemcache_duration' => array('itemcache_duration', t("Cache duration in seconds"), get_config('system','itemcache_duration'), t("How long should the cache files be hold? Default value is 86400 seconds (One day).")),
'$lockpath' => array('lockpath', t("Path for lock file"), get_config('system','lockpath'), "The lock file is used to avoid multiple pollers at one time. Only define a folder here."),
'$temppath' => array('temppath', t("Temp path"), get_config('system','temppath'), "If you have a restricted system where the webserver can't access the system temp path, enter another path here."),
'$basepath' => array('basepath', t("Base path to installation"), get_config('system','basepath'), "If the system cannot detect the correct path to your installation, enter the correct path here. This setting should only be set if you are using a restricted system and symbolic links to your webroot."),
'$form_security_token' => get_form_security_token("admin_site"), '$form_security_token' => get_form_security_token("admin_site"),
)); ));

31
mod/share.php
View File

@ -18,15 +18,30 @@ function share_init(&$a) {
if(! count($r) || ($r[0]['private'] == 1)) if(! count($r) || ($r[0]['private'] == 1))
killme(); killme();
$o = ''; if (intval(get_config('system','new_share'))) {
if (strpos($r[0]['body'], "[/share]") !== false) {
$pos = strpos($r[0]['body'], "[share");
$o = substr($r[0]['body'], $pos);
} else {
$o = "[share author='".str_replace("'", "&#039;",$r[0]['author-name']).
"' profile='".$r[0]['author-link'].
"' avatar='".$r[0]['author-avatar'].
"' link='".$r[0]['plink']."']\n";
if($r[0]['title'])
$o .= '[b]'.$r[0]['title'].'[/b]'."\n";
$o .= $r[0]['body'];
$o.= "[/share]";
}
} else {
$o = '';
$o .= "\xE2\x99\xb2" . ' [url=' . $r[0]['author-link'] . ']' . $r[0]['author-name'] . '[/url]' . "\n"; $o .= "\xE2\x99\xb2" . ' [url=' . $r[0]['author-link'] . ']' . $r[0]['author-name'] . '[/url]' . "\n";
if($r[0]['title']) if($r[0]['title'])
$o .= '[b]' . $r[0]['title'] . '[/b]' . "\n"; $o .= '[b]' . $r[0]['title'] . '[/b]' . "\n";
$o .= $r[0]['body'] . "\n" ; $o .= $r[0]['body'] . "\n" ;
$o .= (($r[0]['plink']) ? '[url=' . $r[0]['plink'] . ']' . t('link') . '[/url]' . "\n" : '');
$o .= (($r[0]['plink']) ? '[url=' . $r[0]['plink'] . ']' . t('link') . '[/url]' . "\n" : '');
}
echo $o; echo $o;
killme(); killme();
} }

41
view/admin_site.tpl
View File

@ -41,12 +41,14 @@
<form action="$baseurl/admin/site" method="post"> <form action="$baseurl/admin/site" method="post">
<input type='hidden' name='form_security_token' value='$form_security_token'> <input type='hidden' name='form_security_token' value='$form_security_token'>
{{ inc $field_input with $field=$sitename }}{{ endinc }} {{ inc field_input.tpl with $field=$sitename }}{{ endinc }}
{{ inc $field_textarea with $field=$banner }}{{ endinc }} {{ inc field_textarea.tpl with $field=$banner }}{{ endinc }}
{{ inc $field_select with $field=$language }}{{ endinc }} {{ inc field_select.tpl with $field=$language }}{{ endinc }}
{{ inc $field_select with $field=$theme }}{{ endinc }} {{ inc field_select.tpl with $field=$theme }}{{ endinc }}
{{ inc $field_select with $field=$theme_mobile }}{{ endinc }} {{ inc field_select.tpl with $field=$theme_mobile }}{{ endinc }}
{{ inc $field_select with $field=$ssl_policy }}{{ endinc }} {{ inc field_select.tpl with $field=$ssl_policy }}{{ endinc }}
{{ inc field_checkbox.tpl with $field=$new_share }}{{ 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>
@ -81,15 +83,24 @@
<div class="submit"><input type="submit" name="page_site" value="$submit" /></div> <div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
<h3>$advanced</h3> <h3>$advanced</h3>
{{ inc $field_checkbox with $field=$no_utf }}{{ endinc }} {{ inc field_checkbox.tpl with $field=$no_utf }}{{ endinc }}
{{ inc $field_checkbox with $field=$verifyssl }}{{ endinc }} {{ inc field_checkbox.tpl with $field=$verifyssl }}{{ endinc }}
{{ inc $field_input with $field=$proxy }}{{ endinc }} {{ inc field_input.tpl with $field=$proxy }}{{ endinc }}
{{ inc $field_input with $field=$proxyuser }}{{ endinc }} {{ inc field_input.tpl with $field=$proxyuser }}{{ endinc }}
{{ inc $field_input with $field=$timeout }}{{ endinc }} {{ inc field_input.tpl with $field=$timeout }}{{ endinc }}
{{ inc $field_input with $field=$delivery_interval }}{{ endinc }} {{ inc field_input.tpl with $field=$delivery_interval }}{{ endinc }}
{{ inc $field_input with $field=$poll_interval }}{{ endinc }} {{ inc field_input.tpl with $field=$poll_interval }}{{ endinc }}
{{ inc $field_input with $field=$maxloadavg }}{{ endinc }} {{ inc field_input.tpl with $field=$maxloadavg }}{{ endinc }}
{{ inc $field_input with $field=$abandon_days }}{{ endinc }} {{ inc field_input.tpl with $field=$abandon_days }}{{ endinc }}
{{ inc field_input.tpl with $field=$lockpath }}{{ endinc }}
{{ inc field_input.tpl with $field=$temppath }}{{ endinc }}
{{ inc field_input.tpl with $field=$basepath }}{{ endinc }}
<h3>$performance</h3>
{{ inc field_checkbox.tpl with $field=$use_fulltext_engine }}{{ endinc }}
{{ inc field_input.tpl with $field=$itemcache }}{{ endinc }}
{{ inc field_input.tpl with $field=$itemcache_duration }}{{ 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>

17
view/theme/vier/comment_item.tpl
View File

@ -29,15 +29,16 @@
<div class="comment-edit-text-end"></div> <div class="comment-edit-text-end"></div>
<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-$id" style="display: none;" > <div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-$id" style="display: none;" >
<div class="comment-edit-bb-$id"> <div class="comment-edit-bb">
<a class="icon bb-image" style="cursor: pointer;" title="$edimg" onclick="insertFormatting('$comment','img',$id);">img</a> <a title="$edimg" onclick="insertFormatting('$comment','img',$id);"><i class="icon-picture"></i></a>
<a class="icon bb-url" style="cursor: pointer;" title="$edurl" onclick="insertFormatting('$comment','url',$id);">url</a> <a title="$edurl" onclick="insertFormatting('$comment','url',$id);"><i class="icon-bookmark"></i></a>
<a class="icon bb-video" style="cursor: pointer;" title="$edvideo" onclick="insertFormatting('$comment','video',$id);">video</a> <a title="$edvideo" onclick="insertFormatting('$comment','video',$id);"><i class="icon-film"></i></a>
<a class="icon underline" style="cursor: pointer;" title="$eduline" onclick="insertFormatting('$comment','u',$id);">u</a> <a title="$eduline" onclick="insertFormatting('$comment','u',$id);"><i class="icon-underline"></i></a>
<a class="icon italic" style="cursor: pointer;" title="$editalic" onclick="insertFormatting('$comment','i',$id);">i</a> <a title="$editalic" onclick="insertFormatting('$comment','i',$id);"><i class="icon-italic"></i></a>
<a class="icon bold" style="cursor: pointer;" title="$edbold" onclick="insertFormatting('$comment','b',$id);">b</a> <a title="$edbold" onclick="insertFormatting('$comment','b',$id);"><i class="icon-bold"></i></a>
<a class="icon quote" style="cursor: pointer;" title="$edquote" onclick="insertFormatting('$comment','quote',$id);">quote</a> <a title="$edquote" onclick="insertFormatting('$comment','quote',$id);"><i class="icon-comments"></i></a>
</div> </div>
<input type="submit" onclick="post_comment($id); return false;" id="comment-edit-submit-$id" class="comment-edit-submit" name="submit" value="$submit" /> <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> <span onclick="preview_comment($id);" id="comment-edit-preview-link-$id" class="fakelink">$preview</span>

4
view/theme/vier/nav.tpl
View File

@ -35,7 +35,7 @@
</li> </li>
{{ endif }} {{ endif }}
<li id="nav-site-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-site-menu"><span class="icon s22 gear">Site</span></a> <li id="nav-site-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-site-menu"><span class="icon s22 gear" style="color: lightgray;"></span></a>
<ul id="nav-site-menu" class="menu-popup"> <ul id="nav-site-menu" class="menu-popup">
{{ if $nav.manage }}<li><a class="$nav.manage.2" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a></li>{{ endif }} {{ if $nav.manage }}<li><a class="$nav.manage.2" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a></li>{{ endif }}
{{ if $nav.help }} <li><a class="$nav.help.2" target="friendica-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a></li>{{ endif }} {{ if $nav.help }} <li><a class="$nav.help.2" target="friendica-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a></li>{{ endif }}
@ -50,7 +50,7 @@
</ul> </ul>
</li> </li>
{{ if $nav.notifications }} {{ if $nav.notifications }}
<li id="nav-notifications-linkmenu" class="nav-menu-icon"><a href="$nav.notifications.0" rel="#nav-notifications-menu" title="$nav.notifications.1"><span class="icon s22 notify">$nav.notifications.1</span></a> <li id="nav-notifications-linkmenu" class="nav-menu-icon"><a href="$nav.notifications.0" rel="#nav-notifications-menu" title="$nav.notifications.1"><span class="icon s22 notify"></span></a>
<span id="notify-update" class="nav-notify"></span> <span id="notify-update" class="nav-notify"></span>
<ul id="nav-notifications-menu" class="menu-popup"> <ul id="nav-notifications-menu" class="menu-popup">
<li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">$nav.notifications.mark.1</a></li> <li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">$nav.notifications.mark.1</a></li>

3
view/theme/vier/search_item.tpl
View File

@ -45,7 +45,8 @@
</div> </div>
<div class="wall-item-bottom"> <div class="wall-item-bottom">
<div class=""> <div class="">
{{ if $item.plink }}<a title="$item.plink.title" href="$item.plink.href"><i class="icon-link icon-large"></i></a>{{ endif }} <!-- {{ if $item.plink }}<a title="$item.plink.title" href="$item.plink.href"><i class="icon-link icon-large"></i></a>{{ endif }} -->
{{ if $item.conv }}<a href='$item.conv.href' id='context-$item.id' title='$item.conv.title'><i class="icon-link icon-large"></i></a>{{ endif }}
</div> </div>
<div class="wall-item-actions"> <div class="wall-item-actions">

303
view/theme/vier/style.css
View File

@ -5,6 +5,7 @@
/* @import "css/font-awesome.css"; */ /* @import "css/font-awesome.css"; */
@import url("css/font-awesome.css") all; @import url("css/font-awesome.css") all;
@import url("css/font2.css") all;
/* ========= */ /* ========= */
/* = Admin = */ /* = Admin = */
@ -23,14 +24,16 @@
} }
.admin.linklist { .admin.linklist {
border: 0px; padding: 0px; border: 0px;
padding: 0px;
list-style: none;
margin-top: 0px;
} }
.admin.link { .admin.link {
list-style-position: inside; list-style-position: inside;
font-size: 1em; font-size: 1em;
padding: 5px; padding-left: 5px;
width: 100px;
margin: 5px; margin: 5px;
} }
@ -86,104 +89,50 @@
#adminpage .selectall { text-align: right; } #adminpage .selectall { text-align: right; }
/* icons */ /* icons */
.icon.bb-url{ /*
background-image: url("../../../view/theme/diabook/icons/bb-url.png");
float: right;
margin-top: 2px;}
.icon.quote{
background-image: url("../../../view/theme/diabook/icons/quote.png");
float: right;
margin-top: 2px;}
.icon.bold{
background-image: url("../../../view/theme/diabook/icons/bold.png");
float: right;
margin-top: 2px;}
.icon.underline{
background-image: url("../../../view/theme/diabook/icons/underline.png");
float: right;
margin-top: 2px;}
.icon.italic{
background-image: url("../../../view/theme/diabook/icons/italic.png");
float: right;
margin-top: 2px;}
.icon.bb-image{
background-image: url("../../../view/theme/diabook/icons/bb-image.png");
float: right;
margin-top: 2px;}
.icon.bb-video{
background-image: url("../../../view/theme/diabook/icons/bb-video.png");
float: right;
margin-top: 2px;}
.article { background-position: -50px 0px;} .article { background-position: -50px 0px;}
.audio { background-position: -70px 0px;}
.block { background-position: -90px 0px;} .block { background-position: -90px 0px;}
.drop { background-position: -110px 0px;}
.drophide { background-position: -130px 0px;} .drophide { background-position: -130px 0px;}
.edit { background-position: -150px 0px;}
.camera { background-position: -170px 0px;}
.dislike { background-position: -190px 0px;}
.like { background-position: -210px 0px;}
.link { background-position: -230px 0px;}
.globe { background-position: -50px -20px;}
.noglobe { background-position: -70px -20px;} .noglobe { background-position: -70px -20px;}
.no { background-position: -90px -20px;} .no { background-position: -90px -20px;}
.pause { background-position: -110px -20px;}
.play { background-position: -130px -20px;}
.pencil { background-position: -150px -20px;}
.small-pencil { background-position: -170px -20px;}
.recycle { background-position: -190px -20px;} .recycle { background-position: -190px -20px;}
.remote-link { background-position: -210px -20px;} .remote-link { background-position: -210px -20px;}
.share { background-position: -230px -20px;} .share { background-position: -230px -20px;}
.tools { background-position: -50px -40px;} .tools { background-position: -50px -40px;}
.lock { background-position: -70px -40px;}
.unlock { background-position: -90px -40px;}
.video { background-position: -110px -40px;}
.youtube { background-position: -130px -40px;} .youtube { background-position: -130px -40px;}
.attach { background-position: -190px -40px;}
.language { background-position: -210px -40px;} .language { background-position: -210px -40px;}
.on { background-position: -50px -60px;}
.off { background-position: -70px -60px;}
.prev { background-position: -90px -60px;} .prev { background-position: -90px -60px;}
.next { background-position: -110px -60px;} .next { background-position: -110px -60px;}
.tagged { background-position: -130px -60px;} .tagged { background-position: -130px -60px;}
*/
.attachtype {
display: block; width: 20px; height: 23px;
background-image: url('../../../images/content-types.png');
}
.type-video { background-position: 0px 0px; }
.type-image { background-position: -20px 0px; }
.type-audio { background-position: -40px 0px; }
.type-text { background-position: -60px 0px; }
.type-unkn { background-position: -80px 0px; }
.icon.drop, .icon.drophide { .icon.drop, .icon.drophide {
float: left; float: left;
} }
.icon {
display: block;
width: 18px;
height: 18px;
background-image: url('icons.png');
}
.icon { .icon {
background-color: transparent ; background-color: transparent ;
background-repeat: no-repeat; background-repeat: no-repeat;
/* background-position: left center; */ width: 18px;
height: 18px;
display: block; display: block;
overflow: hidden; overflow: hidden;
text-indent: -9999px;
padding: 1px; padding: 1px;
color: #999;
}
.icon:hover {
text-decoration: none;
color: #000;
}
.icon a:hover {
} }
.icon.text { .icon.text {
@ -193,36 +142,6 @@
min-width: 10px; min-width: 10px;
height: 10px; height: 10px;
} }
.icon.s10.notify {
background-image: url("../../../images/icons/10/notify_off.png");
}
.icon.s10.gear {
background-image: url("../../../images/icons/10/gear.png");
}
.icon.s10.add {
background-image: url("../../../images/icons/10/add.png");
}
.icon.s10.delete {
background-image: url("../../../images/icons/10/delete.png");
}
.icon.s10.edit {
background-image: url("../../../images/icons/10/edit.png");
}
.icon.s10.star {
background-image: url("../../../images/icons/10/star.png");
}
.icon.s10.menu {
background-image: url("../../../images/icons/10/menu.png");
}
.icon.s10.link {
background-image: url("../../../images/icons/10/link.png");
}
.icon.s10.lock {
background-image: url("../../../images/icons/10/lock.png");
}
.icon.s10.unlock {
background-image: url("../../../images/icons/10/unlock.png");
}
.icon.s10.text { .icon.s10.text {
padding: 2px 0px 0px 15px; padding: 2px 0px 0px 15px;
font-size: 10px; font-size: 10px;
@ -231,112 +150,33 @@
min-width: 16px; min-width: 16px;
height: 16px; height: 16px;
} }
.icon.s16.notify {
background-image: url("../../../images/icons/16/notify_off.png");
}
.icon.s16.gear {
background-image: url("../../../images/icons/16/gear.png");
}
.icon.s16.add {
background-image: url("../../../images/icons/16/add.png");
}
.icon.s16.delete {
background-image: url("../../../images/icons/16/delete.png");
}
/*.icon.s16.edit {
background-image: url("../../../images/icons/16/edit.png");
}*/
.icon.s16.star {
background-image: url("../../../images/icons/16/star.png");
}
.icon.s16.menu {
background-image: url("../../../images/icons/16/menu.png");
}
/*.icon.s16.link {
background-image: url("../../../images/icons/16/link.png");
}*/
.icon.s16.lock {
background-image: url("../../../images/icons/16/lock.png");
}
.icon.s16.unlock {
background-image: url("../../../images/icons/16/unlock.png");
}
.icon.s16.text { .icon.s16.text {
padding: 4px 0px 0px 20px; padding: 4px 0px 0px 20px;
font-size: 10px; font-size: 10px;
} }
.wall-item-decor .icon.s22.lock {
color: #888;
}
.wall-item-decor .icon.s22.lock:hover {
color: #000;
text-decoration: none;
}
.icon.s22 { .icon.s22 {
min-width: 22px; min-width: 22px;
height: 22px; height: 22px;
} }
.icon.s22.notify { .icon.s22.notify {
background-image: url("../../../images/icons/22/notify_off.png"); color: gray;
}
.icon.s22.gear {
background-image: url("../../../images/icons/22/gear.png");
}
.icon.s22.add {
background-image: url("../../../images/icons/22/add.png");
}
.icon.s22.delete {
background-image: url("../../../images/icons/22/delete.png");
}
.icon.s22.edit {
background-image: url("../../../images/icons/22/edit.png");
}
.icon.s22.star {
background-image: url("../../../images/icons/22/star.png");
}
.icon.s22.menu {
background-image: url("../../../images/icons/22/menu.png");
}
.icon.s22.link {
background-image: url("../../../images/icons/22/link.png");
}
.icon.s22.lock {
background-image: url("../../../images/icons/22/lock.png");
}
.icon.s22.unlock {
background-image: url("../../../images/icons/22/unlock.png");
} }
.icon.s22.text { .icon.s22.text {
padding: 10px 0px 0px 25px; padding: 10px 0px 0px 25px;
width: 200px; width: 230px;
font-size: 1em;
} }
.icon.s48 { .icon.s48 {
width: 48px; width: 48px;
height: 48px; height: 48px;
} }
.icon.s48.notify {
background-image: url("../../../images/icons/48/notify_off.png");
}
.icon.s48.gear {
background-image: url("../../../images/icons/48/gear.png");
}
.icon.s48.add {
background-image: url("../../../images/icons/48/add.png");
}
.icon.s48.delete {
background-image: url("../../../images/icons/48/delete.png");
}
.icon.s48.edit {
background-image: url("../../../images/icons/48/edit.png");
}
.icon.s48.star {
background-image: url("../../../images/icons/48/star.png");
}
.icon.s48.menu {
background-image: url("../../../images/icons/48/menu.png");
}
.icon.s48.link {
background-image: url("../../../images/icons/48/link.png");
}
.icon.s48.lock {
background-image: url("../../../images/icons/48/lock.png");
}
.icon.s48.unlock {
background-image: url("../../../images/icons/48/unlock.png");
}
.sparkle { .sparkle {
cursor: url('lock.cur'), pointer; cursor: url('lock.cur'), pointer;
} }
@ -355,10 +195,10 @@ div.pager, .birthday-notice {
border-radius: 6px; border-radius: 6px;
background-color: #f2f2f2; background-color: #f2f2f2;
clear: left; clear: left;
margin-top: 15px; margin-top: 5px;
padding: 1%; padding: 1%;
height: 1em; height: 1em;
margin-bottom: 15px; margin-bottom: 5px;
} }
.birthday-notice { .birthday-notice {
@ -512,7 +352,7 @@ code {
.tool { .tool {
height: auto; height: auto;
overflow: auto; overflow: auto;
padding: 3px; padding: 0px;
} }
#saved-search-ul .tool:hover, #saved-search-ul .tool:hover,
#nets-sidebar .tool:hover, #nets-sidebar .tool:hover,
@ -531,10 +371,32 @@ code {
.tool a:hover { .tool a:hover {
text-decoration: underline; text-decoration: underline;
} }
.groupsideedit, .savedsearchdrop {
float: right;
opacity: 0.3;
}
.groupsideedit:hover, .savedsearchdrop:hover {
opacity: 1;
}
.sidebar-group-element { .sidebar-group-element {
/* color: #000; */ /* color: #000; */
} }
#sidebar-new-group, #posted-date-selector, #hide-forum-list, #forum-list, #sidebar-ungrouped,
.side-link, #peoplefind-desc, #connect-desc, #follow-sidebar form, #peoplefind-sidebar form,
#netsearch-box form {
margin-left: 10px;
}
#sidebar-ungrouped, .side-link {
padding-top: 5px;
}
#forum-list {
margin-top: 2px;
}
/* popup notifications */ /* popup notifications */
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;
@ -587,6 +449,7 @@ header #banner #logo-text {
} }
/* nav */ /* nav */
nav { nav {
min-width: 1000px;
width: 100%; width: 100%;
height: 32px; height: 32px;
position: fixed; position: fixed;
@ -633,7 +496,7 @@ nav ul li .menu-popup {
right: auto; right: auto;
} }
nav #search-box #search-text { nav #search-box #search-text {
background-image: url('icons/lupe.png'); /* background-image: url('icons/lupe.png'); */
background-repeat:no-repeat; background-repeat:no-repeat;
padding-left:0px; padding-left:0px;
border-top-left-radius: 15px; border-top-left-radius: 15px;
@ -739,7 +602,7 @@ nav #nav-notifications-linkmenu {
margin-right: 5px; margin-right: 5px;
} }
nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-linkmenu.selected .icon.s22.notify { nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-linkmenu.selected .icon.s22.notify {
background-image: url("../../../images/icons/22/notify_on.png"); color: white;
} }
nav #nav-messages-linkmenu.selected, nav #nav-messages-linkmenu.selected,
nav #nav-user-linklabel.selected, nav #nav-user-linklabel.selected,
@ -747,8 +610,9 @@ nav #nav-apps-link.selected {
background-color: #364e59; background-color: #364e59;
} }
nav #nav-community-link { /* nav #nav-community-link { */
margin-left: 215px; nav ul {
margin-left: 210px;
} }
nav #nav-user-linkmenu { nav #nav-user-linkmenu {
@ -882,16 +746,17 @@ aside {
display: table-cell; display: table-cell;
vertical-align: top; vertical-align: top;
width: 185px; width: 185px;
padding: 0px 10px 0px 20px; padding: 10px 10px 10px 20px;
border-right: 1px solid #D2D2D2; border-right: 1px solid #D2D2D2;
background-color: #ECECF2; background-color: #ECECF2;
font-size: 14px; font-size: 14px;
/* background: #F1F1F1; */ /* background: #F1F1F1; */
} }
aside .vcard .fn { aside .vcard .fn {
font-size: 16px; font-size: 18px;
font-weight: bold; font-weight: bold;
margin-bottom: 5px; margin-bottom: 5px;
float: left;
} }
aside .vcard .title { aside .vcard .title {
margin-bottom: 5px; margin-bottom: 5px;
@ -903,14 +768,14 @@ aside .vcard dl {
aside .vcard dt { aside .vcard dt {
float: left; float: left;
margin-left: 0px; margin-left: 0px;
width: 35%; /* width: 35%; */
text-align: right; text-align: right;
color: #999999; color: #999999;
} }
aside .vcard dd { aside .vcard dd {
float: left; float: left;
margin-left: 4px; margin-left: 4px;
width: 60%; /* width: 60%; */
} }
aside #profile-extra-links ul { aside #profile-extra-links ul {
padding: 0px; padding: 0px;
@ -941,7 +806,7 @@ aside #profiles-menu {
width: 20em; width: 20em;
} }
aside #search-text { aside #search-text, aside #side-follow-url, aside #side-peoplefind-url {
width: 150px; width: 150px;
height: 17px; height: 17px;
padding-left: 10px; padding-left: 10px;
@ -955,6 +820,12 @@ aside #search-text {
-moz-border-right-colors: #dbdbdb; -moz-border-right-colors: #dbdbdb;
} }
aside h4 {
margin-bottom: 0px;
margin-top: 0px;
font-size: 1.17em;
}
.nets-ul { .nets-ul {
margin-top: 0px; margin-top: 0px;
} }
@ -1001,7 +872,7 @@ aside #search-text {
} }
/* widget */ /* widget */
.widget { .widget {
margin-bottom: 2em; margin-bottom: 1em;
/*.action .s10 { width: 10px; overflow: hidden; padding: 0px;} /*.action .s10 { width: 10px; overflow: hidden; padding: 0px;}
.action .s16 { width: 16px; overflow: hidden; padding: 0px;}*/ .action .s16 { width: 16px; overflow: hidden; padding: 0px;}*/
/* font-size: 12px; */ /* font-size: 12px; */
@ -1052,15 +923,16 @@ aside #search-text {
} }
.widget ul { .widget ul {
padding: 0px; padding: 0px;
-webkit-margin-before: 0em; margin-top: 0px;
-webkit-margin-after: 0em; margin-bottom: 0px;
} }
.widget ul li { .widget ul li {
padding-left: 10px; padding-left: 5px;
/* min-height: 20px; */ /* min-height: 20px; */
list-style: none; list-style: none;
padding-top: 1px; padding-top: 0px;
padding-bottom: 1px; padding-bottom: 0px;
margin: 5px;
} }
.widget .tool.selected { .widget .tool.selected {
background: url('../../../images/selected.png') no-repeat left center; background: url('../../../images/selected.png') no-repeat left center;
@ -1075,7 +947,7 @@ section {
display: table-cell; display: table-cell;
vertical-align: top; vertical-align: top;
width: 760px; width: 760px;
padding: 0px 0px 0px 10px; padding: 10px 0px 10px 10px;
} }
/* wall item */ /* wall item */
.tread-wrapper { .tread-wrapper {
@ -1765,7 +1637,6 @@ ul.tabs a, #jot-preview-link, .comment-edit-submit-wrapper .fakelink {
} }
ul.tabs li .active, ul.tabs a:hover, #jot-preview-link:hover, .comment-edit-submit-wrapper .fakelink:hover { ul.tabs li .active, ul.tabs a:hover, #jot-preview-link:hover, .comment-edit-submit-wrapper .fakelink:hover {
color: #fff; color: #fff;
text-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5); text-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
border: 1px solid #ececf2; border: 1px solid #ececf2;
@ -1780,6 +1651,19 @@ ul.tabs li .active, ul.tabs a:hover, #jot-preview-link:hover, .comment-edit-subm
text-decoration: none; text-decoration: none;
} }
.comment-edit-bb {
float:right;
}
.comment-edit-bb a {
color: #888;
padding: 0px 5px 1px 5px;
}
.comment-edit-bb a:hover {
color: #000;
text-decoration: none;
}
/** /**
* Form fields * Form fields
*/ */
@ -1855,6 +1739,7 @@ ul.tabs li .active, ul.tabs a:hover, #jot-preview-link:hover, .comment-edit-subm
.profile-edit-side-div { .profile-edit-side-div {
display: none; display: none;
/* float: right; */
} }
#register-form label, #register-form label,

3
view/theme/vier/theme.php
View File

@ -1,10 +1,11 @@
<?php <?php
/** /**
* Name: Vier * Name: Vier
* Version: 0.1 * Version: 0.9
* Author: Fabio <http://kirgroup.com/profile/fabrixxm> * Author: Fabio <http://kirgroup.com/profile/fabrixxm>
* Author: Ike <http://pirati.ca/profile/heluecht> * Author: Ike <http://pirati.ca/profile/heluecht>
* Maintainer: Ike <http://pirati.ca/profile/heluecht> * Maintainer: Ike <http://pirati.ca/profile/heluecht>
* Description: "Vier" uses the font awesome font library: http://fortawesome.github.com/Font-Awesome/
*/ */
$a->theme['template_engine'] = 'smarty3'; $a->theme['template_engine'] = 'smarty3';

4
view/theme/vier/wall_thread.tpl
View File

@ -54,7 +54,7 @@
<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle">$item.name</span></a> <a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle">$item.name</span></a>
{{ if $item.owner_url }}$item.via <a href="$item.owner_url" target="redir" 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 }} {{ if $item.owner_url }}$item.via <a href="$item.owner_url" target="redir" 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 }}
<span class="wall-item-ago">- <span class="wall-item-ago">-
{{ if $item.plink }}<a class="link" title="$item.plink.title" href="$item.plink.href" style="color: #999">$item.ago</a>{{ else }} $item.ago {{ endif }} {{ if $item.plink }}<a title="$item.plink.title" href="$item.plink.href" style="color: #999">$item.ago</a>{{ else }} $item.ago {{ endif }}
{{ if $item.lock }} - <span class="fakelink" style="color: #999" onclick="lockview(event,$item.id);">$item.lock</span> {{ endif }} {{ if $item.lock }} - <span class="fakelink" style="color: #999" onclick="lockview(event,$item.id);">$item.lock</span> {{ endif }}
</span> </span>
</div> </div>
@ -98,7 +98,7 @@
{{ endif }} {{ endif }}
{{ endif }} {{ endif }}
{{ if $item.vote.share }} {{ if $item.vote.share }}
<a href="#" id="share-$item.id" title="$item.vote.share.0" onclick="jotShare($item.id); return false"><i class="icon-share icon-large"></i></a> <a href="#" id="share-$item.id" title="$item.vote.share.0" onclick="jotShare($item.id); return false"><i class="icon-retweet icon-large"></i></a>
{{ endif }} {{ endif }}
{{ if $item.star }} {{ if $item.star }}
<a href="#" id="star-$item.id" onclick="dostar($item.id); return false;" class="$item.star.classdo" title="$item.star.do"><i class="icon-star icon-large"></i></a> <a href="#" id="star-$item.id" onclick="dostar($item.id); return false;" class="$item.star.classdo" title="$item.star.do"><i class="icon-star icon-large"></i></a>