From e9eb15373faf2d01f5dde7b0db4ee4152e83d338 Mon Sep 17 00:00:00 2001 From: Fabio Comuni Date: Mon, 10 Oct 2011 16:48:38 +0200 Subject: [PATCH 1/8] Remove full profile html from php and add new template 'profile_advanced.tpl' --- include/profile_advanced.php | 303 +++++++---------------------------- view/profile_advanced.tpl | 143 +++++++++++++++++ 2 files changed, 205 insertions(+), 241 deletions(-) create mode 100644 view/profile_advanced.tpl diff --git a/include/profile_advanced.php b/include/profile_advanced.php index 22e035fe6..ccecb95de 100644 --- a/include/profile_advanced.php +++ b/include/profile_advanced.php @@ -2,257 +2,78 @@ function advanced_profile(&$a) { -$o .= ''; + $o .= ''; -$o .= '

' . t('Profile') . '

'; + $o .= '

' . t('Profile') . '

'; -if($a->profile['name']) { - $lbl_fullname = t('Full Name:'); - $fullname = $a->profile['name']; + if($a->profile['name']) { -$o .= <<< EOT -
-
$lbl_fullname
-
$fullname
-
-
-EOT; -} + $tpl = get_markup_template('profile_advanced.tpl'); + + $profile = array(); + + $profile['fullname'] = array( t('Full Name:'), $a->profile['name'] ) ; + + if($a->profile['gender']) $profile['gender'] = array( t('Gender:'), $a->profile['gender'] ); + -if($a->profile['gender']) { - $lbl_gender = t('Gender:'); - $gender = $a->profile['gender']; + if(($a->profile['dob']) && ($a->profile['dob'] != '0000-00-00')) { + + $year_bd_format = t('j F, Y'); + $short_bd_format = t('j F'); -$o .= <<< EOT -
-
$lbl_gender
-
$gender
-
-
-EOT; -} + + $val = ((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'],6) . ' 00:00 +00:00',$short_bd_format))); + + $profile['birthday'] = array( t('Birthday:'), $val); -if(($a->profile['dob']) && ($a->profile['dob'] != '0000-00-00')) { - $lbl_birthday = t('Birthday:'); + } -$o .= <<< EOT -
-
$lbl_birthday
-EOT; + if($age = age($a->profile['dob'],$a->profile['timezone'],'')) $profile['age'] = array( t('Age:'), $age ); + -// 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 .= '
' - . ((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'],6) . ' 00:00 +00:00',$short_bd_format))) - . "
\r\n
"; + if($a->profile['with']) $profile['marital']['with'] = $a->profile['with']; + + + if($a->profile['sexual']) $profile['sexual'] = array( t('Sexual Preference:'), $a->profile['sexual'] ); + + 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 .= '
'; } - -if($age = age($a->profile['dob'],$a->profile['timezone'],'')) { - $lbl_age = t('Age:'); -$o .= <<< EOT -
-
$lbl_age
-
$age
-
-
-EOT; -} - -if($a->profile['marital']) { - $lbl_marital = t('♥ Status:'); - $marital = $a->profile['marital']; - -$o .= <<< EOT -
-
$lbl_marital
-
$marital
-EOT; - -if($a->profile['with']) { - $with = $a->profile['with']; - $o .= "
($with)
"; -} -$o .= <<< EOT -
-
-EOT; -} - -if($a->profile['sexual']) { - $lbl_sexual = t('Sexual Preference:'); - $sexual = $a->profile['sexual']; - -$o .= <<< EOT -
-
$lbl_sexual
-
$sexual
-
-
-EOT; -} - -if($a->profile['homepage']) { - $lbl_homepage = t('Homepage:'); - $homepage = linkify($a->profile['homepage']); -$o .= <<< EOT -
-
$lbl_homepage
-
$homepage
-
-
-EOT; -} - -if($a->profile['politic']) { - $lbl_politic = t('Political Views:'); - $politic = $a->profile['politic']; -$o .= <<< EOT -
-
$lbl_politic
-
$politic
-
-
-EOT; -} - -if($a->profile['religion']) { - $lbl_religion = t('Religion:'); - $religion = $a->profile['religion']; -$o .= <<< EOT -
-
$lbl_religion
-
$religion
-
-
-EOT; -} -if($txt = prepare_text($a->profile['about'])) { - $lbl_about = t('About:'); -$o .= <<< EOT -
-
$lbl_about
-
-
$txt
-
-
-EOT; -} - -if($txt = prepare_text($a->profile['interest'])) { - $lbl_interests = t('Hobbies/Interests:'); -$o .= <<< EOT -
-
$lbl_interests
-
-
$txt
-
-
-EOT; -} - -if($txt = prepare_text($a->profile['contact'])) { - $lbl_contact = t('Contact information and Social Networks:'); -$o .= <<< EOT -
-
$lbl_contact
-
-
$txt
-
-
-EOT; -} - -if($txt = prepare_text($a->profile['music'])) { - $lbl_music = t('Musical interests:'); -$o .= <<< EOT -
-
$lbl_music
-
-
$txt
-
-
-EOT; -} - -if($txt = prepare_text($a->profile['book'])) { - $lbl_book = t('Books, literature:'); -$o .= <<< EOT -
-
$lbl_book
-
-
$txt
-
-
-EOT; -} - -if($txt = prepare_text($a->profile['tv'])) { - $lbl_tv = t('Television:'); -$o .= <<< EOT -
-
$lbl_tv
-
-
$txt
-
-
-EOT; -} - -if($txt = prepare_text($a->profile['film'])) { - $lbl_film = t('Film/dance/culture/entertainment:'); -$o .= <<< EOT -
-
$lbl_film
-
-
$txt
-
-
-EOT; -} - -if($txt = prepare_text($a->profile['romance'])) { - $lbl_romance = t('Love/Romance:'); -$o .= <<< EOT -
-
$lbl_romance
-
-
$txt
-
-
-EOT; -} - -if($txt = prepare_text($a->profile['work'])) { - $lbl_work = t('Work/employment:'); -$o .= <<< EOT -
-
$lbl_work
-
-
$txt
-
-
-EOT; -} - -if($txt = prepare_text($a->profile['education'])) { - $lbl_education = t('School/education:'); -$o .= <<< EOT -
-
$lbl_education
-
-
$txt
-
-
-EOT; -} - -return $o; -} diff --git a/view/profile_advanced.tpl b/view/profile_advanced.tpl new file mode 100644 index 000000000..136edf8d7 --- /dev/null +++ b/view/profile_advanced.tpl @@ -0,0 +1,143 @@ +

$title

+ +
+
$profile.fullname.0
+
$profile.fullname.1
+
+ +{{ if $profile.gender }} +
+
$profile.gender.0
+
$profile.gender.1
+
+{{ endif }} + +{{ if $profile.birthday }} +
+
$profile.birthday.0
+
$profile.birthday.1
+
+{{ endif }} + +{{ if $profile.age }} +
+
$profile.age.0
+
$profile.age.1
+
+{{ endif }} + +{{ if $profile.marital }} +
+
♥ $profile.marital.0
+
$profile.marital.1 {{ if $profile.marital.with }}($profile.marital.with){{ endif }}
+
+{{ endif }} + +{{ if $profile.sexual }} +
+
$profile.sexual.0
+
$profile.sexual.1
+
+{{ endif }} + +{{ if $profile.homepage }} +
+
$profile.homepage.0
+
$profile.homepage.1
+
+{{ endif }} + +{{ if $profile.politic }} +
+
$profile.politic.0
+
$profile.politic.1
+
+{{ endif }} + +{{ if $profile.religion }} +
+
$profile.religion.0
+
$profile.religion.1
+
+{{ endif }} + +{{ if $profile.about }} +
+
$profile.about.0
+
$profile.about.1
+
+{{ endif }} + +{{ if $profile.interest }} +
+
$profile.interest.0
+
$profile.interest.1
+
+{{ endif }} + + +{{ if $profile.contact }} +
+
$profile.contact.0
+
$profile.contact.1
+
+{{ endif }} + + +{{ if $profile.music }} +
+
$profile.music.0
+
$profile.music.1
+
+{{ endif }} + + +{{ if $profile.book }} +
+
$profile.book.0
+
$profile.book.1
+
+{{ endif }} + + +{{ if $profile.tv }} +
+
$profile.tv.0
+
$profile.tv.1
+
+{{ endif }} + + +{{ if $profile.film }} +
+
$profile.film.0
+
$profile.film.1
+
+{{ endif }} + + +{{ if $profile.romance }} +
+
$profile.romance.0
+
$profile.romance.1
+
+{{ endif }} + + +{{ if $profile.work }} +
+
$profile.work.0
+
$profile.work.1
+
+{{ endif }} + +{{ if $profile.education }} +
+
$profile.education.0
+
$profile.education.1
+
+{{ endif }} + + + + From 906addf865ccab2c98d5035fc6c1b10d43004dfe Mon Sep 17 00:00:00 2001 From: Fabio Comuni Date: Mon, 10 Oct 2011 17:01:14 +0200 Subject: [PATCH 2/8] common_tabs in notifications.php --- mod/notifications.php | 30 +++++++++++++++++++++--------- view/notifications.tpl | 8 +------- 2 files changed, 22 insertions(+), 16 deletions(-) diff --git a/mod/notifications.php b/mod/notifications.php index 6d78ea024..52ce90e14 100644 --- a/mod/notifications.php +++ b/mod/notifications.php @@ -62,7 +62,18 @@ function notifications_content(&$a) { notice( t('Permission denied.') . EOL); return; } - + + $notif_tpl = get_markup_template('notifications.tpl'); + + $tabs = array( + 'net' => array('label' => t('Network'), 'url'=>$a->get_baseurl().'/notifications/network', 'sel'=>''), + 'home' => array('label' => t('Home'), 'url'=>$a->get_baseurl().'/notifications/home', 'sel'=>''), + 'intros'=> array('label' => t('Introductions'), 'url'=>$a->get_baseurl().'/notifications/intros', 'sel'=>''), + 'msg' => array('label' => t('Messages'), 'url'=>$a->get_baseurl().'/message', 'sel'=>''), + ); + + + $o = ''; if( (($a->argc > 1) && ($a->argv[1] == 'intros')) || (($a->argc == 1))) { @@ -72,7 +83,7 @@ function notifications_content(&$a) { else $sql_extra = " AND `ignore` = 0 "; - $notif_tpl = get_markup_template('notifications.tpl'); + $notif_content .= '' . ((strlen($sql_extra)) ? t('Show Ignored Requests') : t('Hide Ignored Requests')) . '' . "\r\n"; @@ -164,11 +175,12 @@ function notifications_content(&$a) { } } else - info( t('No notifications.') . EOL); - + $notif_content .= t('

No notifications.

'); + + $tabs['intros']['sel']='active'; $o .= replace_macros($notif_tpl,array( '$notif_content' => $notif_content, - '$activetab' => 'intros' + '$tabs' => $tabs, )); $o .= paginate($a); @@ -176,7 +188,6 @@ function notifications_content(&$a) { } else if (($a->argc > 1) && ($a->argv[1] == 'network')) { - $notif_tpl = get_markup_template('notifications.tpl'); $r = q("SELECT `item`.`id`,`item`.`parent`, `item`.`verb`, `item`.`author-name`, `item`.`author-link`, `item`.`author-avatar`, `item`.`created`, `item`.`object` as `object`, @@ -251,14 +262,14 @@ function notifications_content(&$a) { $notif_content = t('Nothing new!'); } + $tabs['net']['sel']='active'; $o .= replace_macros($notif_tpl,array( '$notif_content' => $notif_content, - '$activetab' => 'network' + '$tabs' => $tabs, )); } else if (($a->argc > 1) && ($a->argv[1] == 'home')) { - $notif_tpl = get_markup_template('notifications.tpl'); $r = q("SELECT `item`.`id`,`item`.`parent`, `item`.`verb`, `item`.`author-name`, `item`.`author-link`, `item`.`author-avatar`, `item`.`created`, `item`.`object` as `object`, @@ -326,9 +337,10 @@ function notifications_content(&$a) { $notif_content = t('Nothing new!'); } + $tabs['home']['sel'] = 'active'; $o .= replace_macros($notif_tpl,array( '$notif_content' => $notif_content, - '$activetab' => 'home' + '$tabs' => $tabs, )); } diff --git a/view/notifications.tpl b/view/notifications.tpl index 24f78f37e..487f8b480 100644 --- a/view/notifications.tpl +++ b/view/notifications.tpl @@ -1,13 +1,7 @@

Notifications

-

- Network - Home - Introductions - Messages -

-
+{{ inc common_tabs.tpl }}{{ endinc }}
$notif_content From 2650ba49c18c25f1f914f38983f38f4304a20587 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Mon, 17 Oct 2011 07:48:33 +0200 Subject: [PATCH 3/8] video button only for dispy and quattro --- view/theme/dispy/jot.tpl | 3 --- view/theme/quattro/jot.tpl | 3 --- 2 files changed, 6 deletions(-) diff --git a/view/theme/dispy/jot.tpl b/view/theme/dispy/jot.tpl index f6bf91ffa..a2c883e4b 100644 --- a/view/theme/dispy/jot.tpl +++ b/view/theme/dispy/jot.tpl @@ -37,9 +37,6 @@ - diff --git a/view/theme/quattro/jot.tpl b/view/theme/quattro/jot.tpl index 49c0e9fec..d65ac8b17 100644 --- a/view/theme/quattro/jot.tpl +++ b/view/theme/quattro/jot.tpl @@ -31,9 +31,6 @@ -
- youtube -
From de44072172b7f56345041358a0be275b482e474c Mon Sep 17 00:00:00 2001 From: Fabio Comuni Date: Mon, 17 Oct 2011 16:53:59 +0200 Subject: [PATCH 4/8] works on login form --- .htaccess | 4 +-- boot.php | 50 +++++++++++++------------------ include/auth.php | 13 ++++---- view/login.tpl | 43 +++++++++++++------------- view/register-link.tpl | 1 - view/theme/duepuntozero/style.css | 30 ++++++++----------- view/theme/loozah/style.css | 41 +++++++++++-------------- view/theme/testbubble/login.tpl | 25 ---------------- view/theme/testbubble/style.css | 39 +++--------------------- 9 files changed, 87 insertions(+), 159 deletions(-) delete mode 100644 view/register-link.tpl delete mode 100644 view/theme/testbubble/login.tpl diff --git a/.htaccess b/.htaccess index 73031b962..3ababd770 100644 --- a/.htaccess +++ b/.htaccess @@ -1,4 +1,4 @@ -Options -Indexes +#Options -Indexes AddType application/x-java-archive .jar AddType audio/ogg .oga @@ -8,7 +8,7 @@ Deny from all RewriteEngine on - + RewriteBase /~fabio/friendika/ # Protect repository directory from browsing RewriteRule "(^|/)\.git" - [F] diff --git a/boot.php b/boot.php index 9f382b302..e7cd06504 100644 --- a/boot.php +++ b/boot.php @@ -636,29 +636,16 @@ function get_guid($size=16) { if(! function_exists('login')) { function login($register = false) { $o = ""; - $register_tpl = (($register) ? get_markup_template("register-link.tpl") : ""); - - $register_html = replace_macros($register_tpl,array( - '$title' => t('Create a New Account'), - '$desc' => t('Register') - )); + $reg = false; + if ($register) { + $reg = array( + 'title' => t('Create a New Account'), + 'desc' => t('Register') + ); + } $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()) { $tpl = get_markup_template("logout.tpl"); } @@ -667,17 +654,22 @@ function login($register = false) { } - $o = ''; $o .= replace_macros($tpl,array( '$logout' => t('Logout'), - '$register_html' => $register_html, - '$classname' => $classname, - '$namelabel' => $namelabel, - '$passlabel' => $passlabel, - '$login' => $login, - '$lostpass' => $lostpass, - '$lostlink' => $lostlink + '$login' => t('Login'), + + '$lname' => array('username', t('Nickname or Email address: ') , '', ''), + '$lpassword' => array('password', t('Password: '), '', ''), + + '$openid' => !$noid, + '$lopenid' => array('openid_url', t('OpenID: '),'',''), + + + '$register' => $reg, + + '$lostpass' => t('Forgot your password?'), + '$lostlink' => t('Password Reset'), )); call_hooks('login_hook',$o); diff --git a/include/auth.php b/include/auth.php index 1f16b3504..45c71c66b 100644 --- a/include/auth.php +++ b/include/auth.php @@ -104,11 +104,12 @@ else { if((x($_POST,'password')) && strlen($_POST['password'])) $encrypted = hash('whirlpool',trim($_POST['password'])); 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'); - $openid_url = trim($_POST['openid_url']); + $openid_url = trim( (strlen($_POST['openid_url'])?$_POST['openid_url']:$_POST['username']) ); // validate_url alters the calling parameter @@ -161,7 +162,7 @@ else { $record = null; $addon_auth = array( - 'username' => trim($_POST['openid_url']), + 'username' => trim($_POST['username']), 'password' => trim($_POST['password']), 'authenticated' => 0, 'user_record' => null @@ -187,8 +188,8 @@ else { $r = q("SELECT `user`.*, `user`.`pubkey` as `upubkey`, `user`.`prvkey` as `uprvkey` FROM `user` WHERE ( `email` = '%s' OR `nickname` = '%s' ) AND `password` = '%s' AND `blocked` = 0 AND `account_expired` = 0 AND `verified` = 1 LIMIT 1", - dbesc(trim($_POST['openid_url'])), - dbesc(trim($_POST['openid_url'])), + dbesc(trim($_POST['username'])), + dbesc(trim($_POST['username'])), dbesc($encrypted) ); if(count($r)) @@ -196,7 +197,7 @@ else { } 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 ); goaway(z_root()); } diff --git a/view/login.tpl b/view/login.tpl index 27598cd50..5240bb9ad 100644 --- a/view/login.tpl +++ b/view/login.tpl @@ -1,25 +1,28 @@
- -
- - -
-
-
- - -
-
- + +
+ +
+
+ + diff --git a/view/register-link.tpl b/view/register-link.tpl deleted file mode 100644 index 802c5f99f..000000000 --- a/view/register-link.tpl +++ /dev/null @@ -1 +0,0 @@ - $desc diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css index 9bb866e76..6f452cebc 100644 --- a/view/theme/duepuntozero/style.css +++ b/view/theme/duepuntozero/style.css @@ -27,8 +27,7 @@ input { img { border :0px; } -#id_openid_url, -.openid { +.openid input { background: url(login-bg.gif) no-repeat; background-position: 0 50%; padding-left: 18px; @@ -332,26 +331,23 @@ div.wall-item-content-wrapper.shiny { margin-top: 10px; } -#label-login-name, #label-login-password, #login-extra-filler { + +#login_standard { + width: 210px; float: left; - width: 200px; - margin-bottom: 20px; +} +#login_openid { + width: 210px; + margin-left: 250px; } - -#login-password { - float: left; - width: 170px; +#login_standard input, +#login_openid input { + width: 180px; } -#login-name { - float: left; - width: 153px; -} - -#login-name.no-openid { - float: left; - width: 170px; +#login-extra-links { + clear: both; } #register-link, #lost-password-link { diff --git a/view/theme/loozah/style.css b/view/theme/loozah/style.css index c6250c51c..447072390 100644 --- a/view/theme/loozah/style.css +++ b/view/theme/loozah/style.css @@ -41,18 +41,21 @@ input:hover { cursor: pointer; } -#id_openid_url, -.openid { +.openid input{ background-color: #ECECEC !important; background: url(login-bg.gif) no-repeat; background-position: 0 50%; padding-left: 18px; + width: 385px !important; } -#id_openid_url:hover, -.openid:hover { + +.openid input:hover { background-color: #0CBEFE !important; } + + + option { background-color: #ECD6D2; } @@ -451,27 +454,20 @@ nav { margin-top: 10px; } -#label-login-name, #label-login-password, #login-extra-filler { +#login_standard { + width: 480px; float: left; - width: 200px; - margin-bottom: 20px; +} +#login_openid { + width: 480px; + margin-left: 490px; } - -#login-password { - float: left; - width: 170px; -} - -#login-name { - float: left; - width: 153px; -} - -#login-name.no-openid { - float: left; - width: 170px; +#login_standard input, +#login_openid input { + width: 180px!important; } +#login-extra-links { clear: both; } #register-link, #lost-password-link { float: left; @@ -479,9 +475,6 @@ nav { margin-right: 15px; } -#login-name-end, #login-password-end, #login-extra-end, #login-submit-end { - clear: both; -} #login-submit-button { /* margin-top: 10px; */ diff --git a/view/theme/testbubble/login.tpl b/view/theme/testbubble/login.tpl deleted file mode 100644 index c17950ece..000000000 --- a/view/theme/testbubble/login.tpl +++ /dev/null @@ -1,25 +0,0 @@ - -
- -
- - -
-
-
- - -
-
-
- - $lostlink -
-
- -
-
- diff --git a/view/theme/testbubble/style.css b/view/theme/testbubble/style.css index 4a3edc163..83afe78f4 100644 --- a/view/theme/testbubble/style.css +++ b/view/theme/testbubble/style.css @@ -823,7 +823,7 @@ profile-jot-banner-wrapper { /* ======== */ .tabs { - width: 600px; + width: 450px; list-style: none; padding: 10px; margin: 0px 0px 10px 0px; @@ -2101,19 +2101,11 @@ margin-left: 0px; /* = Register, Settings, Profile Forms = */ /* ===================================== */ -#id_openid_url, -.openid { +.openid input{ background: url(login-bg.gif) no-repeat; background-position: 0 50%; - padding-left: 18px !important; - width: 385px; -} - -.openid { - width: 150px !important; -} -#login-password { - width: 168px !important; + padding-left: 18px; + width: 384px!important; } #profile-tabs-wrapper { @@ -2218,25 +2210,6 @@ margin-left: 0px; 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, #profile-edit-form div { clear: both; @@ -2621,10 +2594,6 @@ tr { width: 150px; } -.directory-end { - clear: both; -} - /* ========= */ /* = Admin = */ /* ========= */ From a2dc8bad2ee2358b92b9efe626b527c3f12b2777 Mon Sep 17 00:00:00 2001 From: Fabio Comuni Date: Mon, 17 Oct 2011 16:54:21 +0200 Subject: [PATCH 5/8] fix tabs in notifications --- mod/notifications.php | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/mod/notifications.php b/mod/notifications.php index 9761a944d..3182a790c 100644 --- a/mod/notifications.php +++ b/mod/notifications.php @@ -88,10 +88,8 @@ function notifications_content(&$a) { '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))) { @@ -197,7 +195,7 @@ function notifications_content(&$a) { $o .= replace_macros($notif_tpl,array( '$notif_header' => t('Notifications'), - '$tabs' => $tab_content, + '$tabs' => $tabs, '$notif_content' => $notif_content, '$activetab' => 'intros' )); @@ -284,7 +282,7 @@ function notifications_content(&$a) { $o .= replace_macros($notif_tpl,array( '$notif_header' => t('Notifications'), - '$tabs' => $tab_content, + '$tabs' => $tabs, '$notif_content' => $notif_content, '$activetab' => 'network' )); @@ -361,7 +359,7 @@ function notifications_content(&$a) { $o .= replace_macros($notif_tpl,array( '$notif_header' => t('Notifications'), - '$tabs' => $tab_content, + '$tabs' => $tabs, '$notif_content' => $notif_content, '$activetab' => 'home' )); From b22ab4e308b767b38a236801f28e227f97b592c9 Mon Sep 17 00:00:00 2001 From: Fabio Comuni Date: Mon, 17 Oct 2011 17:11:49 +0200 Subject: [PATCH 6/8] fix buttons in quattro --- view/theme/quattro/colors.less | 5 +++++ view/theme/quattro/quattro.less | 18 ++++++------------ view/theme/quattro/style.css | 18 ++++++++---------- 3 files changed, 19 insertions(+), 22 deletions(-) diff --git a/view/theme/quattro/colors.less b/view/theme/quattro/colors.less index 564cf6d24..a7a91114c 100644 --- a/view/theme/quattro/colors.less +++ b/view/theme/quattro/colors.less @@ -38,6 +38,10 @@ @LinkHover: @Blue3; @LinkVisited: @Blue3; + +@ButtonColor: @Grey1; +@ButtonBackgroundColor: @Grey5; + @Banner: @Grey1; @NavbarBackground:@Metalic4; @@ -72,3 +76,4 @@ @CommentBoxEmptyBorderColor: @Grey3; @CommentBoxFullColor: @Grey5; @CommentBoxFullBorderColor: @Grey5; + diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less index 9f47cf099..782e1b62b 100644 --- a/view/theme/quattro/quattro.less +++ b/view/theme/quattro/quattro.less @@ -433,15 +433,11 @@ section { } /** buttons **/ input[type="submit"] { - border: 1px solid; - background-color: @BodyColor; - font: bold 85%; - color: @Grey1; - height: 20px; - padding: 10px 5px; - border-radius: 8px; - -moz-border-radius: 8px; - -webkit-border-radius: 8px; + border: 0px; + background-color: @ButtonBackgroundColor; + color: @ButtonColor; + padding: 0px 10px; + .rounded(5px); } @@ -473,10 +469,8 @@ input[type="submit"] { background-position: 7px 7px; background-repeat: no-repeat; padding: 7px 5px 0px 30px; - -webkit-border-radius: 5px ; - -moz-border-radius: 5px; - border-radius: 5px; color: #999999; + .rounded(5px); } #acl-showall.selected { color: #000000; diff --git a/view/theme/quattro/style.css b/view/theme/quattro/style.css index 56c4bc967..aa4552837 100644 --- a/view/theme/quattro/style.css +++ b/view/theme/quattro/style.css @@ -693,15 +693,13 @@ section { } /** buttons **/ input[type="submit"] { - border: 1px solid; + border: 0px; background-color: #2d2d2d; - font: bold 85%; color: #ffffff; - height: 20px; - padding: 10px 5px; - border-radius: 8px; - -moz-border-radius: 8px; - -webkit-border-radius: 8px; + padding: 0px 10px; + -moz-border-radius: 5px 5px 5px 5px; + -webkit-border-radius: 5px 5px 5px 5px; + border-radius: 5px 5px 5px 5px; } /** acl **/ #photo-edit-perms-select, #photos-upload-permissions-wrapper, #profile-jot-acl-wrapper { @@ -726,10 +724,10 @@ input[type="submit"] { background-position: 7px 7px; background-repeat: no-repeat; padding: 7px 5px 0px 30px; - -webkit-border-radius: 5px ; - -moz-border-radius: 5px; - border-radius: 5px; 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 { color: #000000; From 5830682e0cbe02d1b08042c31e893fbe4c6d7366 Mon Sep 17 00:00:00 2001 From: Fabio Comuni Date: Mon, 17 Oct 2011 17:14:10 +0200 Subject: [PATCH 7/8] another fix to tabs in notifications --- mod/notifications.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/mod/notifications.php b/mod/notifications.php index 3182a790c..3fee2b140 100644 --- a/mod/notifications.php +++ b/mod/notifications.php @@ -197,7 +197,6 @@ function notifications_content(&$a) { '$notif_header' => t('Notifications'), '$tabs' => $tabs, '$notif_content' => $notif_content, - '$activetab' => 'intros' )); $o .= paginate($a); @@ -284,7 +283,6 @@ function notifications_content(&$a) { '$notif_header' => t('Notifications'), '$tabs' => $tabs, '$notif_content' => $notif_content, - '$activetab' => 'network' )); } else if (($a->argc > 1) && ($a->argv[1] == 'home')) { @@ -361,7 +359,6 @@ function notifications_content(&$a) { '$notif_header' => t('Notifications'), '$tabs' => $tabs, '$notif_content' => $notif_content, - '$activetab' => 'home' )); } From 9254c13f6203f4991f51694381037538cd7710ab Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Mon, 17 Oct 2011 17:40:00 +0200 Subject: [PATCH 8/8] reverted rewrite base --- .htaccess | 1 - 1 file changed, 1 deletion(-) diff --git a/.htaccess b/.htaccess index 3ababd770..1df509670 100644 --- a/.htaccess +++ b/.htaccess @@ -8,7 +8,6 @@ Deny from all RewriteEngine on - RewriteBase /~fabio/friendika/ # Protect repository directory from browsing RewriteRule "(^|/)\.git" - [F]