Tupambae_Org/friendica_2021-01
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #30 from fabrixxm/master

Browse source 
some fix and and some other works
This commit is contained in:
fabrixxm 2011-10-17 08:20:26 -07:00
commit 399f630b10
16 changed files with 323 additions and 435 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.htaccess
View file

@ -1,4 +1,4 @@
Options -Indexes #Options -Indexes
AddType application/x-java-archive .jar AddType application/x-java-archive .jar
AddType audio/ogg .oga AddType audio/ogg .oga
@ -8,7 +8,7 @@ Deny from all
<IfModule mod_rewrite.c> <IfModule mod_rewrite.c>
RewriteEngine on RewriteEngine on
RewriteBase /~fabio/friendika/
# Protect repository directory from browsing # Protect repository directory from browsing
RewriteRule "(^|/)\.git" - [F] RewriteRule "(^|/)\.git" - [F]

50
boot.php
View file

@ -636,29 +636,16 @@ function get_guid($size=16) {
if(! function_exists('login')) { if(! function_exists('login')) {
function login($register = false) { function login($register = false) {
$o = ""; $o = "";
$register_tpl = (($register) ? get_markup_template("register-link.tpl") : ""); $reg = false;
if ($register) {
$register_html = replace_macros($register_tpl,array( $reg = array(
'$title' => t('Create a New Account'), 'title' => t('Create a New Account'),
'$desc' => t('Register') 'desc' => t('Register')
)); );
}
$noid = get_config('system','no_openid'); $noid = get_config('system','no_openid');
if($noid) {
$classname = 'no-openid';
$namelabel = t('Nickname or Email address: ');
$passlabel = t('Password: ');
$login = t('Login');
}
else {
$classname = 'openid';
$namelabel = t('Nickname/Email/OpenID: ');
$passlabel = t("Password \x28if not OpenID\x29: ");
$login = t('Login');
}
$lostpass = t('Forgot your password?');
$lostlink = t('Password Reset');
if(local_user()) { if(local_user()) {
$tpl = get_markup_template("logout.tpl"); $tpl = get_markup_template("logout.tpl");
} }
@ -667,17 +654,22 @@ function login($register = false) {
} }
$o = '<script type="text/javascript"> $(document).ready(function() { $("#login-name").focus();} );</script>';
$o .= replace_macros($tpl,array( $o .= replace_macros($tpl,array(
'$logout' => t('Logout'), '$logout' => t('Logout'),
'$register_html' => $register_html, '$login' => t('Login'),
'$classname' => $classname,
'$namelabel' => $namelabel, '$lname' => array('username', t('Nickname or Email address: ') , '', ''),
'$passlabel' => $passlabel, '$lpassword' => array('password', t('Password: '), '', ''),
'$login' => $login,
'$lostpass' => $lostpass, '$openid' => !$noid,
'$lostlink' => $lostlink '$lopenid' => array('openid_url', t('OpenID: '),'',''),
'$register' => $reg,
'$lostpass' => t('Forgot your password?'),
'$lostlink' => t('Password Reset'),
)); ));
call_hooks('login_hook',$o); call_hooks('login_hook',$o);

13
include/auth.php
View file

@ -104,11 +104,12 @@ else {
if((x($_POST,'password')) && strlen($_POST['password'])) if((x($_POST,'password')) && strlen($_POST['password']))
$encrypted = hash('whirlpool',trim($_POST['password'])); $encrypted = hash('whirlpool',trim($_POST['password']));
else { else {
if((x($_POST,'openid_url')) && strlen($_POST['openid_url'])) { if((x($_POST,'openid_url')) && strlen($_POST['openid_url']) ||
(x($_POST,'username')) && strlen($_POST['username'])) {
$noid = get_config('system','no_openid'); $noid = get_config('system','no_openid');
$openid_url = trim($_POST['openid_url']); $openid_url = trim( (strlen($_POST['openid_url'])?$_POST['openid_url']:$_POST['username']) );
// validate_url alters the calling parameter // validate_url alters the calling parameter
@ -161,7 +162,7 @@ else {
$record = null; $record = null;
$addon_auth = array( $addon_auth = array(
'username' => trim($_POST['openid_url']), 'username' => trim($_POST['username']),
'password' => trim($_POST['password']), 'password' => trim($_POST['password']),
'authenticated' => 0, 'authenticated' => 0,
'user_record' => null 'user_record' => null
@ -187,8 +188,8 @@ else {
$r = q("SELECT `user`.*, `user`.`pubkey` as `upubkey`, `user`.`prvkey` as `uprvkey` $r = q("SELECT `user`.*, `user`.`pubkey` as `upubkey`, `user`.`prvkey` as `uprvkey`
FROM `user` WHERE ( `email` = '%s' OR `nickname` = '%s' ) FROM `user` WHERE ( `email` = '%s' OR `nickname` = '%s' )
AND `password` = '%s' AND `blocked` = 0 AND `account_expired` = 0 AND `verified` = 1 LIMIT 1", AND `password` = '%s' AND `blocked` = 0 AND `account_expired` = 0 AND `verified` = 1 LIMIT 1",
dbesc(trim($_POST['openid_url'])), dbesc(trim($_POST['username'])),
dbesc(trim($_POST['openid_url'])), dbesc(trim($_POST['username'])),
dbesc($encrypted) dbesc($encrypted)
); );
if(count($r)) if(count($r))
@ -196,7 +197,7 @@ else {
} }
if((! $record) || (! count($record))) { if((! $record) || (! count($record))) {
logger('authenticate: failed login attempt: ' . trim($_POST['openid_url'])); logger('authenticate: failed login attempt: ' . trim($_POST['username']));
notice( t('Login failed.') . EOL ); notice( t('Login failed.') . EOL );
goaway(z_root()); goaway(z_root());
} }

303
include/profile_advanced.php
View file

@ -2,257 +2,78 @@
function advanced_profile(&$a) { function advanced_profile(&$a) {
$o .= ''; $o .= '';
$o .= '<h2>' . t('Profile') . '</h2>'; $o .= '<h2>' . t('Profile') . '</h2>';
if($a->profile['name']) { if($a->profile['name']) {
$lbl_fullname = t('Full Name:');
$fullname = $a->profile['name'];
$o .= <<< EOT $tpl = get_markup_template('profile_advanced.tpl');
<div id="advanced-profile-name-wrapper" >
<div id="advanced-profile-name-text" class="advanced-profile-label">$lbl_fullname</div> $profile = array();
<div id="advanced-profile-name" class="advanced-profile-content">$fullname</div>
</div> $profile['fullname'] = array( t('Full Name:'), $a->profile['name'] ) ;
<div id="advanced-profile-name-end"></div>
EOT; if($a->profile['gender']) $profile['gender'] = array( t('Gender:'), $a->profile['gender'] );
}
if($a->profile['gender']) { if(($a->profile['dob']) && ($a->profile['dob'] != '0000-00-00')) {
$lbl_gender = t('Gender:');
$gender = $a->profile['gender']; $year_bd_format = t('j F, Y');
$short_bd_format = t('j F');
$o .= <<< EOT
<div id="advanced-profile-gender-wrapper" > $val = ((intval($a->profile['dob']))
<div id="advanced-profile-gender-text" class="advanced-profile-label">$lbl_gender</div> ? day_translate(datetime_convert('UTC','UTC',$a->profile['dob'] . ' 00:00 +00:00',$year_bd_format))
<div id="advanced-profile-gender" class="advanced-profile-content">$gender</div> : day_translate(datetime_convert('UTC','UTC','2001-' . substr($a->profile['dob'],6) . ' 00:00 +00:00',$short_bd_format)));
</div>
<div id="advanced-profile-gender-end"></div> $profile['birthday'] = array( t('Birthday:'), $val);
EOT;
}
if(($a->profile['dob']) && ($a->profile['dob'] != '0000-00-00')) { }
$lbl_birthday = t('Birthday:');
$o .= <<< EOT if($age = age($a->profile['dob'],$a->profile['timezone'],'')) $profile['age'] = array( t('Age:'), $age );
<div id="advanced-profile-dob-wrapper" >
<div id="advanced-profile-dob-text" class="advanced-profile-label">$lbl_birthday</div>
EOT;
// If no year, add an arbitrary one so just we can parse the month and day. if($a->profile['marital']) $profile['marital'] = array( t('Status:'), $a->profile['marital']);
$year_bd_format = t('j F, Y');
$short_bd_format = t('j F');
$o .= '<div id="advanced-profile-dob" class="advanced-profile-content">' if($a->profile['with']) $profile['marital']['with'] = $a->profile['with'];
. ((intval($a->profile['dob']))
? day_translate(datetime_convert('UTC','UTC',$a->profile['dob'] . ' 00:00 +00:00',$year_bd_format))
: day_translate(datetime_convert('UTC','UTC','2001-' . substr($a->profile['dob'],5) . ' 00:00 +00:00',$short_bd_format))) if($a->profile['sexual']) $profile['sexual'] = array( t('Sexual Preference:'), $a->profile['sexual'] );
. "</div>\r\n</div>";
if($a->profile['homepage']) $profile['homepage'] = array( t('Homepage:'), linkify($a->profile['homepage']) );
if($a->profile['politic']) $profile['politic'] = array( t('Political Views:'), $a->profile['politic']);
if($a->profile['religion']) $profile['religion'] = array( t('Religion:'), $a->profile['religion']);
if($txt = prepare_text($a->profile['about'])) $profile['about'] = array( t('About:'), $txt );
if($txt = prepare_text($a->profile['interest'])) $profile['interest'] = array( t('Hobbies/Interests:'), $txt);
if($txt = prepare_text($a->profile['contact'])) $profile['contact'] = array( t('Contact information and Social Networks:'), $txt);
if($txt = prepare_text($a->profile['music'])) $profile['music'] = array( t('Musical interests:'), $txt);
if($txt = prepare_text($a->profile['book'])) $profile['book'] = array( t('Books, literature:'), $txt);
if($txt = prepare_text($a->profile['tv'])) $profile['tv'] = array( t('Television:'), $txt);
if($txt = prepare_text($a->profile['film'])) $profile['film'] = array( t('Film/dance/culture/entertainment:'), $txt);
if($txt = prepare_text($a->profile['romance'])) $profile['romance'] = array( t('Love/Romance:'), $txt);
if($txt = prepare_text($a->profile['work'])) $profile['work'] = array( t('Work/employment:'), $txt);
if($txt = prepare_text($a->profile['education'])) $profile['education'] = array( t('School/education:'), $txt );
}
return replace_macros($tpl, array(
'$title' => t('Profile'),
'$profile' => $profile,
));
$o .= '<div id="advanced-profile-dob-end"></div>';
} }
if($age = age($a->profile['dob'],$a->profile['timezone'],'')) {
$lbl_age = t('Age:');
$o .= <<< EOT
<div id="advanced-profile-age-wrapper" >
<div id="advanced-profile-age-text" class="advanced-profile-label">$lbl_age</div>
<div id="advanced-profile-age" class="advanced-profile-content">$age</div>
</div>
<div id="advanced-profile-age-end"></div>
EOT;
}
if($a->profile['marital']) {
$lbl_marital = t('<span class="heart">&hearts;</span> Status:');
$marital = $a->profile['marital'];
$o .= <<< EOT
<div id="advanced-profile-marital-wrapper" >
<div id="advanced-profile-marital-text" class="advanced-profile-label">$lbl_marital</div>
<div id="advanced-profile-marital" class="advanced-profile-content">$marital</div>
EOT;
if($a->profile['with']) {
$with = $a->profile['with'];
$o .= "<div id=\"advanced-profile-with\">($with)</div>";
}
$o .= <<< EOT
</div>
<div id="advanced-profile-marital-end"></div>
EOT;
}
if($a->profile['sexual']) {
$lbl_sexual = t('Sexual Preference:');
$sexual = $a->profile['sexual'];
$o .= <<< EOT
<div id="advanced-profile-sexual-wrapper" >
<div id="advanced-profile-sexual-text" class="advanced-profile-label">$lbl_sexual</div>
<div id="advanced-profile-sexual" class="advanced-profile-content">$sexual</div>
</div>
<div id="advanced-profile-sexual-end"></div>
EOT;
}
if($a->profile['homepage']) {
$lbl_homepage = t('Homepage:');
$homepage = linkify($a->profile['homepage']);
$o .= <<< EOT
<div id="advanced-profile-homepage-wrapper" >
<div id="advanced-profile-homepage-text" class="advanced-profile-label">$lbl_homepage</div>
<div id="advanced-profile-homepage" class="advanced-profile-content">$homepage</div>
</div>
<div id="advanced-profile-homepage-end"></div>
EOT;
}
if($a->profile['politic']) {
$lbl_politic = t('Political Views:');
$politic = $a->profile['politic'];
$o .= <<< EOT
<div id="advanced-profile-politic-wrapper" >
<div id="advanced-profile-politic-text" class="advanced-profile-label">$lbl_politic</div>
<div id="advanced-profile-politic" class="advanced-profile-content">$politic</div>
</div>
<div id="advanced-profile-politic-end"></div>
EOT;
}
if($a->profile['religion']) {
$lbl_religion = t('Religion:');
$religion = $a->profile['religion'];
$o .= <<< EOT
<div id="advanced-profile-religion-wrapper" >
<div id="advanced-profile-religion-text" class="advanced-profile-label">$lbl_religion</div>
<div id="advanced-profile-religion" class="advanced-profile-content">$religion</div>
</div>
<div id="advanced-profile-religion-end"></div>
EOT;
}
if($txt = prepare_text($a->profile['about'])) {
$lbl_about = t('About:');
$o .= <<< EOT
<div id="advanced-profile-about-wrapper" >
<div id="advanced-profile-about-text" class="advanced-profile-label">$lbl_about</div>
<br />
<div id="advanced-profile-about" class="advanced-profile-content">$txt</div>
</div>
<div id="advanced-profile-about-end"></div>
EOT;
}
if($txt = prepare_text($a->profile['interest'])) {
$lbl_interests = t('Hobbies/Interests:');
$o .= <<< EOT
<div id="advanced-profile-interest-wrapper" >
<div id="advanced-profile-interest-text" class="advanced-profile-label">$lbl_interests</div>
<br />
<div id="advanced-profile-interest" class="advanced-profile-content">$txt</div>
</div>
<div id="advanced-profile-interest-end"></div>
EOT;
}
if($txt = prepare_text($a->profile['contact'])) {
$lbl_contact = t('Contact information and Social Networks:');
$o .= <<< EOT
<div id="advanced-profile-contact-wrapper" >
<div id="advanced-profile-contact-text" class="advanced-profile-label">$lbl_contact</div>
<br />
<div id="advanced-profile-contact" class="advanced-profile-content">$txt</div>
</div>
<div id="advanced-profile-contact-end"></div>
EOT;
}
if($txt = prepare_text($a->profile['music'])) {
$lbl_music = t('Musical interests:');
$o .= <<< EOT
<div id="advanced-profile-music-wrapper" >
<div id="advanced-profile-music-text" class="advanced-profile-label">$lbl_music</div>
<br />
<div id="advanced-profile-music" class="advanced-profile-content">$txt</div>
</div>
<div id="advanced-profile-music-end"></div>
EOT;
}
if($txt = prepare_text($a->profile['book'])) {
$lbl_book = t('Books, literature:');
$o .= <<< EOT
<div id="advanced-profile-book-wrapper" >
<div id="advanced-profile-book-text" class="advanced-profile-label">$lbl_book</div>
<br />
<div id="advanced-profile-book" class="advanced-profile-content">$txt</div>
</div>
<div id="advanced-profile-book-end"></div>
EOT;
}
if($txt = prepare_text($a->profile['tv'])) {
$lbl_tv = t('Television:');
$o .= <<< EOT
<div id="advanced-profile-tv-wrapper" >
<div id="advanced-profile-tv-text" class="advanced-profile-label">$lbl_tv</div>
<br />
<div id="advanced-profile-tv" class="advanced-profile-content">$txt</div>
</div>
<div id="advanced-profile-tv-end"></div>
EOT;
}
if($txt = prepare_text($a->profile['film'])) {
$lbl_film = t('Film/dance/culture/entertainment:');
$o .= <<< EOT
<div id="advanced-profile-film-wrapper" >
<div id="advanced-profile-film-text" class="advanced-profile-label">$lbl_film</div>
<br />
<div id="advanced-profile-film" class="advanced-profile-content">$txt</div>
</div>
<div id="advanced-profile-film-end"></div>
EOT;
}
if($txt = prepare_text($a->profile['romance'])) {
$lbl_romance = t('Love/Romance:');
$o .= <<< EOT
<div id="advanced-profile-romance-wrapper" >
<div id="advanced-profile-romance-text" class="advanced-profile-label">$lbl_romance</div>
<br />
<div id="advanced-profile-romance" class="advanced-profile-content">$txt</div>
</div>
<div id="advanced-profile-romance-end"></div>
EOT;
}
if($txt = prepare_text($a->profile['work'])) {
$lbl_work = t('Work/employment:');
$o .= <<< EOT
<div id="advanced-profile-work-wrapper" >
<div id="advanced-profile-work-text" class="advanced-profile-label">$lbl_work</div>
<br />
<div id="advanced-profile-work" class="advanced-profile-content">$txt</div>
</div>
<div id="advanced-profile-work-end"></div>
EOT;
}
if($txt = prepare_text($a->profile['education'])) {
$lbl_education = t('School/education:');
$o .= <<< EOT
<div id="advanced-profile-education-wrapper" >
<div id="advanced-profile-education-text" class="advanced-profile-label">$lbl_education</div>
<br />
<div id="advanced-profile-education" class="advanced-profile-content">$txt</div>
</div>
<div id="advanced-profile-education-end"></div>
EOT;
}
return $o;
}

18
mod/notifications.php
View file

@ -88,12 +88,10 @@ function notifications_content(&$a) {
'sel'=> '', 'sel'=> '',
), ),
); );
$tpl = get_markup_template('common_tabs.tpl');
$tab_content = replace_macros($tpl, array('$tabs'=>$tabs)); $o = "";
if( (($a->argc > 1) && ($a->argv[1] == 'intros')) || (($a->argc == 1))) { if( (($a->argc > 1) && ($a->argv[1] == 'intros')) || (($a->argc == 1))) {
nav_set_selected('introductions'); nav_set_selected('introductions');
if(($a->argc > 2) && ($a->argv[2] == 'all')) if(($a->argc > 2) && ($a->argv[2] == 'all'))
@ -197,15 +195,15 @@ function notifications_content(&$a) {
$o .= replace_macros($notif_tpl,array( $o .= replace_macros($notif_tpl,array(
'$notif_header' => t('Notifications'), '$notif_header' => t('Notifications'),
'$tabs' => $tab_content, '$tabs' => $tabs,
'$notif_content' => $notif_content, '$notif_content' => $notif_content,
'$activetab' => 'intros'
)); ));
$o .= paginate($a); $o .= paginate($a);
return $o; return $o;
} else if (($a->argc > 1) && ($a->argv[1] == 'network')) { } else if (($a->argc > 1) && ($a->argv[1] == 'network')) {
$notif_tpl = get_markup_template('notifications.tpl'); $notif_tpl = get_markup_template('notifications.tpl');
$r = q("SELECT `item`.`id`,`item`.`parent`, `item`.`verb`, `item`.`author-name`, $r = q("SELECT `item`.`id`,`item`.`parent`, `item`.`verb`, `item`.`author-name`,
@ -283,9 +281,8 @@ function notifications_content(&$a) {
$o .= replace_macros($notif_tpl,array( $o .= replace_macros($notif_tpl,array(
'$notif_header' => t('Notifications'), '$notif_header' => t('Notifications'),
'$tabs' => $tab_content, '$tabs' => $tabs,
'$notif_content' => $notif_content, '$notif_content' => $notif_content,
'$activetab' => 'network'
)); ));
} else if (($a->argc > 1) && ($a->argv[1] == 'home')) { } else if (($a->argc > 1) && ($a->argv[1] == 'home')) {
@ -360,9 +357,8 @@ function notifications_content(&$a) {
$o .= replace_macros($notif_tpl,array( $o .= replace_macros($notif_tpl,array(
'$notif_header' => t('Notifications'), '$notif_header' => t('Notifications'),
'$tabs' => $tab_content, '$tabs' => $tabs,
'$notif_content' => $notif_content, '$notif_content' => $notif_content,
'$activetab' => 'home'
)); ));
} }

43
view/login.tpl
View file

@ -1,25 +1,28 @@
<form action="" method="post" > <form action="" method="post" >
<input type="hidden" name="auth-params" value="login" /> <input type="hidden" name="auth-params" value="login" />
<div id="login-name-wrapper">
<label for="login-name" id="label-login-name">$namelabel</label> <div id="login_standard">
<input type="text" maxlength="60" name="openid_url" class="$classname" id="login-name" value="" /> {{ inc field_input.tpl with $field=$lname }}{{ endinc }}
</div> {{ inc field_password.tpl with $field=$lpassword }}{{ endinc }}
<div id="login-name-end" ></div> </div>
<div id="login-password-wrapper">
<label for="login-password" id="label-login-password">$passlabel</label> {{ if $openid }}
<input type="password" maxlength="60" name="password" id="login-password" value="" /> <div id="login_openid">
</div> {{ inc field_openid.tpl with $field=$lopenid }}{{ endinc }}
<div id="login-password-end"></div> </div>
<div id="login-extra-links" class=".button"> {{ endif }}
<div id="login-extra-filler">&nbsp;</div>
$register_html <div id="login-extra-links">
{{ if $register }}<a href="register" title="$register.title" id="register-link">$register.desc</a>{{ endif }}
<a href="lostpass" title="$lostpass" id="lost-password-link" >$lostlink</a> <a href="lostpass" title="$lostpass" id="lost-password-link" >$lostlink</a>
</div> </div>
<div id="login-extra-end"></div>
<div id="login-submit-wrapper" > <div id="login-submit-wrapper" >
<input type="submit" name="submit" id="login-submit-button" value="$login" /> <input type="submit" name="submit" id="login-submit-button" value="$login" />
</div> </div>
<div id="login-submit-end"></div>
</form> </form>
<script type="text/javascript"> $(document).ready(function() { $("#id_$lname.0").focus();} );</script>

7
view/notifications.tpl
View file

@ -1,5 +1,8 @@
<h1>$notif_header</h1>
$tabs <h1>Notifications</h1>
{{ inc common_tabs.tpl }}{{ endinc }}
<div class="notif-network-wrapper"> <div class="notif-network-wrapper">
$notif_content $notif_content
</div> </div>

143
view/profile_advanced.tpl Normal file
View file

@ -0,0 +1,143 @@
<h2>$title</h2>
<dl>
<dt>$profile.fullname.0</dt>
<dd>$profile.fullname.1</dd>
</dl>
{{ if $profile.gender }}
<dl>
<dt>$profile.gender.0</dt>
<dd>$profile.gender.1</dd>
</dl>
{{ endif }}
{{ if $profile.birthday }}
<dl>
<dt>$profile.birthday.0</dt>
<dd>$profile.birthday.1</dd>
</dl>
{{ endif }}
{{ if $profile.age }}
<dl>
<dt>$profile.age.0</dt>
<dd>$profile.age.1</dd>
</dl>
{{ endif }}
{{ if $profile.marital }}
<dl>
<dt><span class="heart">&hearts;</span> $profile.marital.0</dt>
<dd>$profile.marital.1 {{ if $profile.marital.with }}($profile.marital.with){{ endif }}</dd>
</dl>
{{ endif }}
{{ if $profile.sexual }}
<dl>
<dt>$profile.sexual.0</dt>
<dd>$profile.sexual.1</dd>
</dl>
{{ endif }}
{{ if $profile.homepage }}
<dl>
<dt>$profile.homepage.0</dt>
<dd>$profile.homepage.1</dd>
</dl>
{{ endif }}
{{ if $profile.politic }}
<dl>
<dt>$profile.politic.0</dt>
<dd>$profile.politic.1</dd>
</dl>
{{ endif }}
{{ if $profile.religion }}
<dl>
<dt>$profile.religion.0</dt>
<dd>$profile.religion.1</dd>
</dl>
{{ endif }}
{{ if $profile.about }}
<dl>
<dt>$profile.about.0</dt>
<dd>$profile.about.1</dd>
</dl>
{{ endif }}
{{ if $profile.interest }}
<dl>
<dt>$profile.interest.0</dt>
<dd>$profile.interest.1</dd>
</dl>
{{ endif }}
{{ if $profile.contact }}
<dl>
<dt>$profile.contact.0</dt>
<dd>$profile.contact.1</dd>
</dl>
{{ endif }}
{{ if $profile.music }}
<dl>
<dt>$profile.music.0</dt>
<dd>$profile.music.1</dd>
</dl>
{{ endif }}
{{ if $profile.book }}
<dl>
<dt>$profile.book.0</dt>
<dd>$profile.book.1</dd>
</dl>
{{ endif }}
{{ if $profile.tv }}
<dl>
<dt>$profile.tv.0</dt>
<dd>$profile.tv.1</dd>
</dl>
{{ endif }}
{{ if $profile.film }}
<dl>
<dt>$profile.film.0</dt>
<dd>$profile.film.1</dd>
</dl>
{{ endif }}
{{ if $profile.romance }}
<dl>
<dt>$profile.romance.0</dt>
<dd>$profile.romance.1</dd>
</dl>
{{ endif }}
{{ if $profile.work }}
<dl>
<dt>$profile.work.0</dt>
<dd>$profile.work.1</dd>
</dl>
{{ endif }}
{{ if $profile.education }}
<dl>
<dt>$profile.education.0</dt>
<dd>$profile.education.1</dd>
</dl>
{{ endif }}

1
view/register-link.tpl
View file

@ -1 +0,0 @@
<a href="register" title = "$title" id="register-link" >$desc</a>

30
view/theme/duepuntozero/style.css
View file

@ -27,8 +27,7 @@ input {
img { border :0px; } img { border :0px; }
#id_openid_url, .openid input {
.openid {
background: url(login-bg.gif) no-repeat; background: url(login-bg.gif) no-repeat;
background-position: 0 50%; background-position: 0 50%;
padding-left: 18px; padding-left: 18px;
@ -332,26 +331,23 @@ div.wall-item-content-wrapper.shiny {
margin-top: 10px; margin-top: 10px;
} }
#label-login-name, #label-login-password, #login-extra-filler {
#login_standard {
width: 210px;
float: left; float: left;
width: 200px; }
margin-bottom: 20px; #login_openid {
width: 210px;
margin-left: 250px;
} }
#login_standard input,
#login-password { #login_openid input {
float: left; width: 180px;
width: 170px;
} }
#login-name { #login-extra-links {
float: left; clear: both;
width: 153px;
}
#login-name.no-openid {
float: left;
width: 170px;
} }
#register-link, #lost-password-link { #register-link, #lost-password-link {

41
view/theme/loozah/style.css
View file

@ -41,18 +41,21 @@ input:hover {
cursor: pointer; cursor: pointer;
} }
#id_openid_url, .openid input{
.openid {
background-color: #ECECEC !important; background-color: #ECECEC !important;
background: url(login-bg.gif) no-repeat; background: url(login-bg.gif) no-repeat;
background-position: 0 50%; background-position: 0 50%;
padding-left: 18px; padding-left: 18px;
width: 385px !important;
} }
#id_openid_url:hover,
.openid:hover { .openid input:hover {
background-color: #0CBEFE !important; background-color: #0CBEFE !important;
} }
option { option {
background-color: #ECD6D2; background-color: #ECD6D2;
} }
@ -451,27 +454,20 @@ nav {
margin-top: 10px; margin-top: 10px;
} }
#label-login-name, #label-login-password, #login-extra-filler { #login_standard {
width: 480px;
float: left; float: left;
width: 200px; }
margin-bottom: 20px; #login_openid {
width: 480px;
margin-left: 490px;
} }
#login_standard input,
#login-password { #login_openid input {
float: left; width: 180px!important;
width: 170px;
}
#login-name {
float: left;
width: 153px;
}
#login-name.no-openid {
float: left;
width: 170px;
} }
#login-extra-links { clear: both; }
#register-link, #lost-password-link { #register-link, #lost-password-link {
float: left; float: left;
@ -479,9 +475,6 @@ nav {
margin-right: 15px; margin-right: 15px;
} }
#login-name-end, #login-password-end, #login-extra-end, #login-submit-end {
clear: both;
}
#login-submit-button { #login-submit-button {
/* margin-top: 10px; */ /* margin-top: 10px; */

5
view/theme/quattro/colors.less
View file

@ -38,6 +38,10 @@
@LinkHover: @Blue3; @LinkHover: @Blue3;
@LinkVisited: @Blue3; @LinkVisited: @Blue3;
@ButtonColor: @Grey1;
@ButtonBackgroundColor: @Grey5;
@Banner: @Grey1; @Banner: @Grey1;
@NavbarBackground:@Metalic4; @NavbarBackground:@Metalic4;
@ -72,3 +76,4 @@
@CommentBoxEmptyBorderColor: @Grey3; @CommentBoxEmptyBorderColor: @Grey3;
@CommentBoxFullColor: @Grey5; @CommentBoxFullColor: @Grey5;
@CommentBoxFullBorderColor: @Grey5; @CommentBoxFullBorderColor: @Grey5;

18
view/theme/quattro/quattro.less
View file

@ -433,15 +433,11 @@ section {
} }
/** buttons **/ /** buttons **/
input[type="submit"] { input[type="submit"] {
border: 1px solid; border: 0px;
background-color: @BodyColor; background-color: @ButtonBackgroundColor;
font: bold 85%; color: @ButtonColor;
color: @Grey1; padding: 0px 10px;
height: 20px; .rounded(5px);
padding: 10px 5px;
border-radius: 8px;
-moz-border-radius: 8px;
-webkit-border-radius: 8px;
} }
@ -473,10 +469,8 @@ input[type="submit"] {
background-position: 7px 7px; background-position: 7px 7px;
background-repeat: no-repeat; background-repeat: no-repeat;
padding: 7px 5px 0px 30px; padding: 7px 5px 0px 30px;
-webkit-border-radius: 5px ;
-moz-border-radius: 5px;
border-radius: 5px;
color: #999999; color: #999999;
.rounded(5px);
} }
#acl-showall.selected { #acl-showall.selected {
color: #000000; color: #000000;

18
view/theme/quattro/style.css
View file

@ -693,15 +693,13 @@ section {
} }
/** buttons **/ /** buttons **/
input[type="submit"] { input[type="submit"] {
border: 1px solid; border: 0px;
background-color: #2d2d2d; background-color: #2d2d2d;
font: bold 85%;
color: #ffffff; color: #ffffff;
height: 20px; padding: 0px 10px;
padding: 10px 5px; -moz-border-radius: 5px 5px 5px 5px;
border-radius: 8px; -webkit-border-radius: 5px 5px 5px 5px;
-moz-border-radius: 8px; border-radius: 5px 5px 5px 5px;
-webkit-border-radius: 8px;
} }
/** acl **/ /** acl **/
#photo-edit-perms-select, #photos-upload-permissions-wrapper, #profile-jot-acl-wrapper { #photo-edit-perms-select, #photos-upload-permissions-wrapper, #profile-jot-acl-wrapper {
@ -726,10 +724,10 @@ input[type="submit"] {
background-position: 7px 7px; background-position: 7px 7px;
background-repeat: no-repeat; background-repeat: no-repeat;
padding: 7px 5px 0px 30px; padding: 7px 5px 0px 30px;
-webkit-border-radius: 5px ;
-moz-border-radius: 5px;
border-radius: 5px;
color: #999999; color: #999999;
-moz-border-radius: 5px 5px 5px 5px;
-webkit-border-radius: 5px 5px 5px 5px;
border-radius: 5px 5px 5px 5px;
} }
#acl-showall.selected { #acl-showall.selected {
color: #000000; color: #000000;

25
view/theme/testbubble/login.tpl
View file

@ -1,25 +0,0 @@
<form action="" method="post" >
<input type="hidden" name="auth-params" value="login" />
<div id="login-name-wrapper">
<label for="login-name" id="label-login-name">$namelabel</label>
<input type="text" maxlength="60" name="openid_url" class="$classname" id="login-name" value="" />
</div>
<div id="login-name-end" ></div>
<div id="login-password-wrapper">
<label for="login-password" id="label-login-password">$passlabel</label>
<input type="password" maxlength="60" name="password" id="login-password" value="" />
</div>
<div id="login-password-end"></div>
<div id="login-submit-wrapper" >
<input type="submit" name="submit" id="login-submit-button" value="$login" />
<a href="lostpass" title="$lostpass" id="lost-password-link" >$lostlink</a>
</div>
<div id="login-submit-end"></div>
<div id="login-extra-links" class=".button">
<div id="login-extra-filler">&nbsp;</div>
$register_html
</div>
<div id="login-extra-end"></div>
</form>

39
view/theme/testbubble/style.css
View file

@ -823,7 +823,7 @@ profile-jot-banner-wrapper {
/* ======== */ /* ======== */
.tabs { .tabs {
width: 600px; width: 450px;
list-style: none; list-style: none;
padding: 10px; padding: 10px;
margin: 0px 0px 10px 0px; margin: 0px 0px 10px 0px;
@ -2101,19 +2101,11 @@ margin-left: 0px;
/* = Register, Settings, Profile Forms = */ /* = Register, Settings, Profile Forms = */
/* ===================================== */ /* ===================================== */
#id_openid_url, .openid input{
.openid {
background: url(login-bg.gif) no-repeat; background: url(login-bg.gif) no-repeat;
background-position: 0 50%; background-position: 0 50%;
padding-left: 18px !important; padding-left: 18px;
width: 385px; width: 384px!important;
}
.openid {
width: 150px !important;
}
#login-password {
width: 168px !important;
} }
#profile-tabs-wrapper { #profile-tabs-wrapper {
@ -2218,25 +2210,6 @@ margin-left: 0px;
padding: 5px; padding: 5px;
} }
.settings-block {
margin-top: 20px;
-moz-box-shadow: 1px 2px 6px 0px #959494;
-webkit-box-shadow: 1px 2px 6px 0px #959494;
box-shadow: 1px 2px 6px 0px #959494;
background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #f8f8f8), color-stop(1, #f6f6f6) );
background:-moz-linear-gradient( center top, #f8f8f8 5%, #f6f6f6 100% );
filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#f8f8f8', endColorstr='#f6f6f6');
background-color:#f8f8f8;
-moz-border-radius:5px;
-webkit-border-radius:5px;
border-radius:5px;
border:1px solid #eee;
color:#a6a6a6;
text-shadow:-1px 0px 0px #bdbdbd;
border: 1px solid #cdcdcd;
padding: 5px;
}
#register-form div, #register-form div,
#profile-edit-form div { #profile-edit-form div {
clear: both; clear: both;
@ -2621,10 +2594,6 @@ tr {
width: 150px; width: 150px;
} }
.directory-end {
clear: both;
}
/* ========= */ /* ========= */
/* = Admin = */ /* = Admin = */
/* ========= */ /* ========= */