diff --git a/boot.php b/boot.php index 1f2b690773..2a8dc3d047 100755 --- a/boot.php +++ b/boot.php @@ -9,7 +9,7 @@ require_once('include/nav.php'); require_once('include/cache.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); -define ( 'FRIENDICA_VERSION', '2.3.1296' ); +define ( 'FRIENDICA_VERSION', '2.3.1297' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DB_UPDATE_VERSION', 1133 ); @@ -1261,17 +1261,20 @@ function current_theme(){ $system_theme = ((isset($a->config['system']['theme'])) ? $a->config['system']['theme'] : ''); $theme_name = ((isset($_SESSION) && x($_SESSION,'theme')) ? $_SESSION['theme'] : $system_theme); - if($theme_name && file_exists('view/theme/' . $theme_name . '/style.css')) + if($theme_name && + (file_exists('view/theme/' . $theme_name . '/style.css') || + file_exists('view/theme/' . $theme_name . '/style.php'))) return($theme_name); foreach($app_base_themes as $t) { - if(file_exists('view/theme/' . $t . '/style.css')) + if(file_exists('view/theme/' . $t . '/style.css')|| + file_exists('view/theme/' . $t . '/style.php')) return($t); } - $fallback = glob('view/theme/*/style.css'); + $fallback = glob('view/theme/*/style.[css|php]'); if(count($fallback)) - return (str_replace('view/theme/','', str_replace("/style.css","",$fallback[0]))); + return (str_replace('view/theme/','', substr($fallback[0],0,-10))); }} @@ -1283,6 +1286,8 @@ if(! function_exists('current_theme_url')) { function current_theme_url() { global $a; $t = current_theme(); + if (file_exists('view/theme/' . $t . '/style.php')) + return($a->get_baseurl() . '/view/theme/' . $t . '/style.pcss'); return($a->get_baseurl() . '/view/theme/' . $t . '/style.css'); }} @@ -1432,4 +1437,4 @@ function zrl($s) { if($mine and ! link_compare($mine,$s)) return $s . $achar . 'zrl=' . urlencode($mine); return $s; -} \ No newline at end of file +} diff --git a/include/auth.php b/include/auth.php index 835616a829..1341f3bb8a 100755 --- a/include/auth.php +++ b/include/auth.php @@ -94,13 +94,17 @@ else { // Otherwise it's probably an openid. + try { require_once('library/openid.php'); $openid = new LightOpenID; $openid->identity = $openid_url; $_SESSION['openid'] = $openid_url; $a = get_app(); $openid->returnUrl = $a->get_baseurl(true) . '/openid'; - goaway($openid->authUrl()); + goaway($openid->authUrl()); + } catch (Exception $e) { + notice( t('We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID.').'

'. t('The error message was:').' '.$e->getMessage()); + } // NOTREACHED } } diff --git a/mod/notifications.php b/mod/notifications.php index 551b307dbd..690a99562f 100755 --- a/mod/notifications.php +++ b/mod/notifications.php @@ -37,7 +37,11 @@ function notifications_post(&$a) { intval($intro_id) ); if(! $fid) { - $r = q("DELETE FROM `contact` WHERE `id` = %d AND `uid` = %d AND `self` = 0 LIMIT 1", + + // The check for blocked and pending is in case the friendship was already approved + // and we just want to get rid of the now pointless notification + + $r = q("DELETE FROM `contact` WHERE `id` = %d AND `uid` = %d AND `self` = 0 AND `blocked` = 1 AND `pending` = 1 LIMIT 1", intval($contact_id), intval(local_user()) ); diff --git a/mod/settings.php b/mod/settings.php index db7330fb59..ce5ceea825 100755 --- a/mod/settings.php +++ b/mod/settings.php @@ -1,6 +1,19 @@ theme_info['extends']; + + if (file_exists("view/theme/$theme/config.php")){ + return "view/theme/$theme/config.php"; + } + if (file_exists("view/theme/$base_theme/config.php")){ + return "view/theme/$base_theme/config.php"; + } + return null; +} + function settings_init(&$a) { if(local_user()) { profile_load($a,$a->user['nickname']); @@ -193,6 +206,45 @@ function settings_post(&$a) { call_hooks('connector_settings_post', $_POST); return; } + + if(($a->argc > 1) && ($a->argv[1] == 'display')) { + + check_form_security_token_redirectOnErr('/settings/display', 'settings_display'); + + $theme = ((x($_POST,'theme')) ? notags(trim($_POST['theme'])) : $a->user['theme']); + $nosmile = ((x($_POST,'nosmile')) ? intval($_POST['nosmile']) : 0); + $browser_update = ((x($_POST,'browser_update')) ? intval($_POST['browser_update']) : 0); + $browser_update = $browser_update * 1000; + if($browser_update < 10000) + $browser_update = 40000; + + $itemspage_network = ((x($_POST,'itemspage_network')) ? intval($_POST['itemspage_network']) : 40); + if($itemspage_network > 100) + $itemspage_network = 40; + + + set_pconfig(local_user(),'system','update_interval', $browser_update); + set_pconfig(local_user(),'system','itemspage_network', $itemspage_network); + set_pconfig(local_user(),'system','no_smilies',$nosmile); + + + if ($theme == $a->user['theme']){ + // call theme_post only if theme has not benn changed + if( ($themeconfigfile = get_theme_config_file($theme)) != null){ + require_once($themeconfigfile); + theme_post($a); + } + } + + + $r = q("UPDATE `user` SET `theme` = '%s' WHERE `uid` = %d LIMIT 1", + dbesc($theme), + intval(local_user()) + ); + + goaway($a->get_baseurl(true) . '/settings/display' ); + return; // NOTREACHED + } check_form_security_token_redirectOnErr('/settings', 'settings'); @@ -227,7 +279,7 @@ function settings_post(&$a) { } } - $theme = ((x($_POST,'theme')) ? notags(trim($_POST['theme'])) : $a->user['theme']); + $username = ((x($_POST,'username')) ? notags(trim($_POST['username'])) : ''); $email = ((x($_POST,'email')) ? notags(trim($_POST['email'])) : ''); $timezone = ((x($_POST,'timezone')) ? notags(trim($_POST['timezone'])) : ''); @@ -242,14 +294,6 @@ function settings_post(&$a) { $expire_starred = ((x($_POST,'expire_starred')) ? intval($_POST['expire_starred']) : 0); $expire_photos = ((x($_POST,'expire_photos'))? intval($_POST['expire_photos']) : 0); - $browser_update = ((x($_POST,'browser_update')) ? intval($_POST['browser_update']) : 0); - $browser_update = $browser_update * 1000; - if($browser_update < 10000) - $browser_update = 40000; - - $itemspage_network = ((x($_POST,'itemspage_network')) ? intval($_POST['itemspage_network']) : 40); - if($itemspage_network > 100) - $itemspage_network = 40; $allow_location = (((x($_POST,'allow_location')) && (intval($_POST['allow_location']) == 1)) ? 1: 0); @@ -263,7 +307,7 @@ function settings_post(&$a) { $suggestme = ((x($_POST,'suggestme')) ? intval($_POST['suggestme']) : 0); $hide_friends = (($_POST['hide-friends'] == 1) ? 1: 0); $hidewall = (($_POST['hidewall'] == 1) ? 1: 0); - $nosmile = ((x($_POST,'nosmile')) ? intval($_POST['nosmile']) : 0); + $notify = 0; @@ -345,11 +389,9 @@ function settings_post(&$a) { set_pconfig(local_user(),'expire','photos', $expire_photos); set_pconfig(local_user(),'system','suggestme', $suggestme); - set_pconfig(local_user(),'system','update_interval', $browser_update); - set_pconfig(local_user(),'system','itemspage_network', $itemspage_network); - set_pconfig(local_user(),'system','no_smilies',$nosmile); - $r = q("UPDATE `user` SET `username` = '%s', `email` = '%s', `openid` = '%s', `timezone` = '%s', `allow_cid` = '%s', `allow_gid` = '%s', `deny_cid` = '%s', `deny_gid` = '%s', `notify-flags` = %d, `page-flags` = %d, `default-location` = '%s', `allow_location` = %d, `theme` = '%s', `maxreq` = %d, `expire` = %d, `openidserver` = '%s', `blockwall` = %d, `hidewall` = %d, `blocktags` = %d WHERE `uid` = %d LIMIT 1", + + $r = q("UPDATE `user` SET `username` = '%s', `email` = '%s', `openid` = '%s', `timezone` = '%s', `allow_cid` = '%s', `allow_gid` = '%s', `deny_cid` = '%s', `deny_gid` = '%s', `notify-flags` = %d, `page-flags` = %d, `default-location` = '%s', `allow_location` = %d, `maxreq` = %d, `expire` = %d, `openidserver` = '%s', `blockwall` = %d, `hidewall` = %d, `blocktags` = %d WHERE `uid` = %d LIMIT 1", dbesc($username), dbesc($email), dbesc($openid), @@ -362,7 +404,6 @@ function settings_post(&$a) { intval($page_flags), dbesc($defloc), intval($allow_location), - dbesc($theme), intval($maxreq), intval($expire), dbesc($openidserver), @@ -440,6 +481,12 @@ function settings_content(&$a) { 'url' => $a->get_baseurl(true).'/settings', 'sel' => (($a->argc == 1)?'active':''), ), + array( + 'label' => t('Display settings'), + 'url' => $a->get_baseurl(true).'/settings/display', + 'sel' => (($a->argc > 1) && ($a->argv[1] === 'display')?'active':''), + ), + array( 'label' => t('Connector settings'), 'url' => $a->get_baseurl(true).'/settings/connectors', @@ -578,31 +625,31 @@ function settings_content(&$a) { $diasp_enabled = sprintf( t('Built-in support for %s connectivity is %s'), t('Diaspora'), ((get_config('system','diaspora_enabled')) ? t('enabled') : t('disabled'))); $ostat_enabled = sprintf( t('Built-in support for %s connectivity is %s'), t('StatusNet'), ((get_config('system','ostatus_disabled')) ? t('disabled') : t('enabled'))); - $mail_disabled = ((function_exists('imap_open') && (! get_config('system','imap_disabled'))) ? 0 : 1); - if(get_config('system','dfrn_only')) - $mail_disabled = 1; + $mail_disabled = ((function_exists('imap_open') && (! get_config('system','imap_disabled'))) ? 0 : 1); + if(get_config('system','dfrn_only')) + $mail_disabled = 1; - if(! $mail_disabled) { - $r = q("SELECT * FROM `mailacct` WHERE `uid` = %d LIMIT 1", - local_user() - ); - } - else { - $r = null; - } + if(! $mail_disabled) { + $r = q("SELECT * FROM `mailacct` WHERE `uid` = %d LIMIT 1", + local_user() + ); + } + else { + $r = null; + } - $mail_server = ((count($r)) ? $r[0]['server'] : ''); - $mail_port = ((count($r) && intval($r[0]['port'])) ? intval($r[0]['port']) : ''); - $mail_ssl = ((count($r)) ? $r[0]['ssltype'] : ''); - $mail_user = ((count($r)) ? $r[0]['user'] : ''); - $mail_replyto = ((count($r)) ? $r[0]['reply_to'] : ''); - $mail_pubmail = ((count($r)) ? $r[0]['pubmail'] : 0); - $mail_action = ((count($r)) ? $r[0]['action'] : 0); - $mail_movetofolder = ((count($r)) ? $r[0]['movetofolder'] : ''); - $mail_chk = ((count($r)) ? $r[0]['last_check'] : '0000-00-00 00:00:00'); + $mail_server = ((count($r)) ? $r[0]['server'] : ''); + $mail_port = ((count($r) && intval($r[0]['port'])) ? intval($r[0]['port']) : ''); + $mail_ssl = ((count($r)) ? $r[0]['ssltype'] : ''); + $mail_user = ((count($r)) ? $r[0]['user'] : ''); + $mail_replyto = ((count($r)) ? $r[0]['reply_to'] : ''); + $mail_pubmail = ((count($r)) ? $r[0]['pubmail'] : 0); + $mail_action = ((count($r)) ? $r[0]['action'] : 0); + $mail_movetofolder = ((count($r)) ? $r[0]['movetofolder'] : ''); + $mail_chk = ((count($r)) ? $r[0]['last_check'] : '0000-00-00 00:00:00'); - $tpl = get_markup_template("settings_connectors.tpl"); + $tpl = get_markup_template("settings_connectors.tpl"); $o .= replace_macros($tpl, array( '$form_security_token' => get_form_security_token("settings_connectors"), @@ -632,6 +679,78 @@ function settings_content(&$a) { return $o; } + /* + * DISPLAY SETTINGS + */ + if(($a->argc > 1) && ($a->argv[1] === 'display')) { + $default_theme = get_config('system','theme'); + if(! $default_theme) + $default_theme = 'default'; + + $allowed_themes_str = get_config('system','allowed_themes'); + $allowed_themes_raw = explode(',',$allowed_themes_str); + $allowed_themes = array(); + if(count($allowed_themes_raw)) + foreach($allowed_themes_raw as $x) + if(strlen(trim($x))) + $allowed_themes[] = trim($x); + + + $themes = array(); + $files = glob('view/theme/*'); + if($allowed_themes) { + foreach($allowed_themes as $th) { + $f = $th; + $is_experimental = file_exists('view/theme/' . $th . '/experimental'); + $unsupported = file_exists('view/theme/' . $th . '/unsupported'); + if (!$is_experimental or ($is_experimental && (get_config('experimentals','exp_themes')==1 or get_config('experimentals','exp_themes')===false))){ + $theme_name = (($is_experimental) ? sprintf("%s - \x28Experimental\x29", $f) : $f); + $themes[$f]=$theme_name; + } + } + } + $theme_selected = (!x($_SESSION,'theme')? $default_theme : $_SESSION['theme']); + + $browser_update = intval(get_pconfig(local_user(), 'system','update_interval')); + $browser_update = (($browser_update == 0) ? 40 : $browser_update / 1000); // default if not set: 40 seconds + + $itemspage_network = intval(get_pconfig(local_user(), 'system','itemspage_network')); + $itemspage_network = (($itemspage_network > 0 && $itemspage_network < 101) ? $itemspage_network : 40); // default if not set: 40 items + + $nosmile = get_pconfig(local_user(),'system','no_smilies'); + $nosmile = (($nosmile===false)? '0': $nosmile); // default if not set: 0 + + + $theme_config = ""; + if( ($themeconfigfile = get_theme_config_file($theme_selected)) != null){ + require_once($themeconfigfile); + $theme_config = theme_content($a); + } + + $tpl = get_markup_template("settings_display.tpl"); + $o = replace_macros($tpl, array( + '$tabs' => $tabs, + '$ptitle' => t('Display Settings'), + '$form_security_token' => get_form_security_token("settings_display"), + '$submit' => t('Submit'), + '$baseurl' => $a->get_baseurl(true), + '$uid' => local_user(), + + '$theme' => array('theme', t('Display Theme:'), $theme_selected, '', $themes), + '$ajaxint' => array('browser_update', t("Update browser every xx seconds"), $browser_update, t('Minimum of 10 seconds, no maximum')), + '$itemspage_network' => array('itemspage_network', t("Number of items to display on the network page:"), $itemspage_network, t('Maximum of 100 items')), + '$nosmile' => array('nosmile', t("Don't show emoticons"), $nosmile, ''), + + '$theme_config' => $theme_config, + )); + + return $o; + } + + + /* + * ACCOUNT SETTINGS + */ require_once('include/acl_selectors.php'); @@ -669,14 +788,7 @@ function settings_content(&$a) { $suggestme = get_pconfig(local_user(), 'system','suggestme'); $suggestme = (($suggestme===false)? '0': $suggestme); // default if not set: 0 - $browser_update = intval(get_pconfig(local_user(), 'system','update_interval')); - $browser_update = (($browser_update == 0) ? 40 : $browser_update / 1000); // default if not set: 40 seconds - $itemspage_network = intval(get_pconfig(local_user(), 'system','itemspage_network')); - $itemspage_network = (($itemspage_network > 0 && $itemspage_network < 101) ? $itemspage_network : 40); // default if not set: 40 items - - $nosmile = get_pconfig(local_user(),'system','no_smilies'); - $nosmile = (($nosmile===false)? '0': $nosmile); // default if not set: 0 if(! strlen($a->user['timezone'])) $timezone = date_default_timezone_get(); @@ -765,33 +877,7 @@ function settings_content(&$a) { info( t('Profile is not published.') . EOL ); - $default_theme = get_config('system','theme'); - if(! $default_theme) - $default_theme = 'default'; - $allowed_themes_str = get_config('system','allowed_themes'); - $allowed_themes_raw = explode(',',$allowed_themes_str); - $allowed_themes = array(); - if(count($allowed_themes_raw)) - foreach($allowed_themes_raw as $x) - if(strlen(trim($x))) - $allowed_themes[] = trim($x); - - - $themes = array(); - $files = glob('view/theme/*'); - if($allowed_themes) { - foreach($allowed_themes as $th) { - $f = $th; - $is_experimental = file_exists('view/theme/' . $th . '/experimental'); - $unsupported = file_exists('view/theme/' . $th . '/unsupported'); - if (!$is_experimental or ($is_experimental && (get_config('experimentals','exp_themes')==1 or get_config('experimentals','exp_themes')===false))){ - $theme_name = (($is_experimental) ? sprintf("%s - \x28Experimental\x29", $f) : $f); - $themes[$f]=$theme_name; - } - } - } - $theme_selected = (!x($_SESSION,'theme')? $default_theme : $_SESSION['theme']); $subdir = ((strlen($a->get_path())) ? '
' . t('or') . ' ' . $a->get_baseurl(true) . '/profile/' . $nickname : ''); @@ -842,10 +928,7 @@ function settings_content(&$a) { '$timezone' => array('timezone_select' , t('Your Timezone:'), select_timezone($timezone), ''), '$defloc' => array('defloc', t('Default Post Location:'), $defloc, ''), '$allowloc' => array('allow_location', t('Use Browser Location:'), ($a->user['allow_location'] == 1), ''), - '$theme' => array('theme', t('Display Theme:'), $theme_selected, '', $themes), - '$ajaxint' => array('browser_update', t("Update browser every xx seconds"), $browser_update, t('Minimum of 10 seconds, no maximum')), - '$itemspage_network' => array('itemspage_network', t("Number of items to display on the network page:"), $itemspage_network, t('Maximum of 100 items')), - '$nosmile' => array('nosmile', t("Don't show emoticons"), $nosmile, ''), + '$h_prv' => t('Security and Privacy Settings'), diff --git a/mod/view.php b/mod/view.php new file mode 100644 index 0000000000..33aa23f447 --- /dev/null +++ b/mod/view.php @@ -0,0 +1,16 @@ +argc == 4){ + $theme = $a->argv[2]; + $THEMEPATH = "view/theme/$theme"; + require_once("view/theme/$theme/style.php"); + } + + killme(); +} diff --git a/view/settings.tpl b/view/settings.tpl index 75225a0f1b..f0fd70921f 100755 --- a/view/settings.tpl +++ b/view/settings.tpl @@ -28,10 +28,7 @@ $nickname_block {{inc field_custom.tpl with $field=$timezone }}{{endinc}} {{inc field_input.tpl with $field=$defloc }}{{endinc}} {{inc field_checkbox.tpl with $field=$allowloc }}{{endinc}} -{{inc field_themeselect.tpl with $field=$theme }}{{endinc}} -{{inc field_input.tpl with $field=$ajaxint }}{{endinc}} -{{inc field_input.tpl with $field=$itemspage_network }}{{endinc}} -{{inc field_checkbox.tpl with $field=$nosmile}}{{endinc}} +
diff --git a/view/settings_display.tpl b/view/settings_display.tpl new file mode 100644 index 0000000000..fc7a56c8ac --- /dev/null +++ b/view/settings_display.tpl @@ -0,0 +1,23 @@ +$tabs + +

$ptitle

+ +
+ + +{{inc field_themeselect.tpl with $field=$theme }}{{endinc}} +{{inc field_input.tpl with $field=$ajaxint }}{{endinc}} +{{inc field_input.tpl with $field=$itemspage_network }}{{endinc}} +{{inc field_checkbox.tpl with $field=$nosmile}}{{endinc}} + + +
+ +
+ +{{ if $theme_config }} +

Theme settings

+$theme_config +{{ endif }} + +
diff --git a/view/theme/diabook-aerith/communityhome.tpl b/view/theme/diabook-aerith/communityhome.tpl index cff75cd40a..cf8d81335a 100755 --- a/view/theme/diabook-aerith/communityhome.tpl +++ b/view/theme/diabook-aerith/communityhome.tpl @@ -17,7 +17,7 @@
{{ if $lastusers_title }}

Connectable Services

-
+
Facebook StatusNet LiveJournal diff --git a/view/theme/diabook-aerith/style-network.css b/view/theme/diabook-aerith/style-network.css index 1b055e3f4a..b35a70c657 100644 --- a/view/theme/diabook-aerith/style-network.css +++ b/view/theme/diabook-aerith/style-network.css @@ -439,7 +439,7 @@ a:hover { clear: both; } .fakelink { - color: #1872A2; + color: #3465A4; /* color: #3e3e8c; */ text-decoration: none; cursor: pointer; @@ -557,13 +557,14 @@ header #banner a:hover { outline: none; vertical-align: middle; font-weight: bolder; + margin-left: 3px; } header #banner #logo-img { height: 25px; margin-top: 3px; } header #banner #logo-text { - font-size: 21px; + font-size: 20px; position: absolute; top: 10%; } @@ -657,7 +658,7 @@ nav #logo-text { nav .nav-menu-search { position: relative; - margin: 3px 17px; + margin: 4px 17px; margin-right: 0px; height: 17px; width: 180px; @@ -718,7 +719,7 @@ nav .nav-menu.selected { nav .nav-notify { display: none; position: absolute; - background-color: #ff0000; + background-color: #fff; /* background-color: #19aeff; */ -moz-border-radius: 5px 5px 5px 5px; -webkit-border-radius: 5px 5px 5px 5px; @@ -730,6 +731,7 @@ nav .nav-notify { right: -6px; min-width: 10px; text-align: center; + border: 1px solid black; } nav .nav-notify.show { display: block; @@ -752,7 +754,7 @@ nav #nav-home-link, #nav-directory-link, #nav-apps-link{ margin-right: 0px; font-weight: bold; margin: 3px 5px; - font-size: 15px; + font-size: 14px; } nav #nav-directory-link{ margin-right: 0px; @@ -1037,6 +1039,8 @@ aside #profiles-menu { } aside #search-text { width: 150px; + height: 17px; + padding-left: 10px; border-top-left-radius: 15px; border-top-right-radius: 15px; border-bottom-right-radius: 15px; @@ -1234,6 +1238,9 @@ body .pageheader{ #birthday-notice, #event-notice, #birthday-wrapper, #event-wrapper{ margin-bottom: 10px; } +#birthday-wrapper a { + color: #3465A4; + } right_aside { display: table-cell; @@ -1256,6 +1263,7 @@ right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow: right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto; width: 100%; } #page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;} #page-sidebar-right_aside ul {margin-top: 0px;} +#page-sidebar-right_aside .label {max-width: 128px;} right_aside .icon {width: 10px; height: 10px;} .close_box { background-image: url("../../../view/theme/diabook-aerith/icons/close_box.png"); @@ -1741,6 +1749,7 @@ transition: all 0.2s ease-in-out; #profile-jot-submit { float: right; margin-top: 2px; + font-size: 14px; } #profile-upload-wrapper { @@ -1793,7 +1802,7 @@ transition: all 0.2s ease-in-out; float: right; margin-left: 10px; margin-top: 2px; - font-size: 10px; + font-size: 9px; font-weight: bolder; cursor: pointer; } @@ -1806,7 +1815,6 @@ transition: all 0.2s ease-in-out; .button.creation1 { background-color: #fff; border: 1px solid #777777; - background-image: -moz-linear-gradient(center top , white 0%, #DDDDDD 100%); border-radius: 3px 3px 3px 3px; box-shadow: 0 1px 1px #CFCFCF; cursor: pointer; @@ -1814,7 +1822,6 @@ transition: all 0.2s ease-in-out; } .button.creation2 { background-color: #3465A4; - background-image: -moz-linear-gradient(center top , #66C1FF 0%, #0097FF 100%); border: 1px solid #777777; color: white; border-radius: 3px 3px 3px 3px; diff --git a/view/theme/diabook-aerith/style-profile.css b/view/theme/diabook-aerith/style-profile.css index 5575deea37..9c9f8b4e69 100644 --- a/view/theme/diabook-aerith/style-profile.css +++ b/view/theme/diabook-aerith/style-profile.css @@ -440,7 +440,7 @@ a:hover { clear: both; } .fakelink { - color: #1872A2; + color: #3465A4; /* color: #3e3e8c; */ text-decoration: none; cursor: pointer; @@ -558,13 +558,14 @@ header #banner a:hover { outline: none; vertical-align: middle; font-weight: bolder; + margin-left: 3px; } header #banner #logo-img { height: 25px; margin-top: 3px; } header #banner #logo-text { - font-size: 21px; + font-size: 20px; position: absolute; top: 10%; } @@ -658,7 +659,7 @@ nav #logo-text { nav .nav-menu-search { position: relative; - margin: 3px 17px; + margin: 4px 17px; margin-right: 0px; height: 17px; width: 180px; @@ -719,7 +720,7 @@ nav .nav-menu.selected { nav .nav-notify { display: none; position: absolute; - background-color: #ff0000; + background-color: #fff; /* background-color: #19aeff; */ -moz-border-radius: 5px 5px 5px 5px; -webkit-border-radius: 5px 5px 5px 5px; @@ -731,6 +732,7 @@ nav .nav-notify { right: -6px; min-width: 10px; text-align: center; + border: 1px solid black; } nav .nav-notify.show { display: block; @@ -753,7 +755,7 @@ nav #nav-home-link, #nav-directory-link, #nav-apps-link{ margin-right: 0px; font-weight: bold; margin: 3px 5px; - font-size: 15px; + font-size: 14px; } nav #nav-directory-link{ margin-right: 0px; @@ -1036,6 +1038,8 @@ aside #profiles-menu { } aside #search-text { width: 150px; + height: 17px; + padding-left: 10px; border-top-left-radius: 15px; border-top-right-radius: 15px; border-bottom-right-radius: 15px; @@ -1233,6 +1237,9 @@ body .pageheader{ #birthday-notice, #event-notice, #birthday-wrapper, #event-wrapper{ margin-bottom: 10px; } +#birthday-wrapper a { + color: #3465A4; + } right_aside { display: table-cell; @@ -1255,6 +1262,7 @@ right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow: right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto; width: 100%; } #page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;} #page-sidebar-right_aside ul {margin-top: 0px;} +#page-sidebar-right_aside .label {max-width: 128px;} right_aside .icon {width: 10px; height: 10px;} .close_box { background-image: url("../../../view/theme/diabook-aerith/icons/close_box.png"); @@ -1735,7 +1743,7 @@ transition: all 0.2s ease-in-out; #profile-jot-submit { float: right; margin-top: 2px; - + font-size: 14px; } #profile-upload-wrapper { float: left; @@ -1787,7 +1795,7 @@ transition: all 0.2s ease-in-out; float: right; margin-left: 10px; margin-top: 2px; - font-size: 10px; + font-size: 9px; font-weight: bolder; cursor: pointer; } @@ -1800,7 +1808,6 @@ transition: all 0.2s ease-in-out; .button.creation1 { background-color: #fff; border: 1px solid #777777; - background-image: -moz-linear-gradient(center top , white 0%, #DDDDDD 100%); border-radius: 3px 3px 3px 3px; box-shadow: 0 1px 1px #CFCFCF; font-weight: bolder; @@ -1808,7 +1815,6 @@ transition: all 0.2s ease-in-out; } .button.creation2 { background-color: #3465A4; - background-image: -moz-linear-gradient(center top , #66C1FF 0%, #0097FF 100%); border: 1px solid #777777; color: white; border-radius: 3px 3px 3px 3px; diff --git a/view/theme/diabook-aerith/style.css b/view/theme/diabook-aerith/style.css index 43b895807d..fbcca699fe 100644 --- a/view/theme/diabook-aerith/style.css +++ b/view/theme/diabook-aerith/style.css @@ -437,7 +437,7 @@ a:hover { clear: both; } .fakelink { - color: #1872A2; + color: #3465A4; /* color: #3e3e8c; */ text-decoration: none; cursor: pointer; @@ -555,13 +555,14 @@ header #banner a:hover { outline: none; vertical-align: middle; font-weight: bolder; + margin-left: 3px; } header #banner #logo-img { height: 25px; margin-top: 3px; } header #banner #logo-text { - font-size: 21px; + font-size: 20px; position: absolute; top: 10%; } @@ -655,7 +656,7 @@ nav #logo-text { nav .nav-menu-search { position: relative; - margin: 3px 17px; + margin: 4px 17px; margin-right: 0px; height: 17px; width: 180px; @@ -716,7 +717,7 @@ nav .nav-menu.selected { nav .nav-notify { display: none; position: absolute; - background-color: #ff0000; + background-color: #fff; /* background-color: #19aeff; */ -moz-border-radius: 5px 5px 5px 5px; -webkit-border-radius: 5px 5px 5px 5px; @@ -728,6 +729,7 @@ nav .nav-notify { right: -6px; min-width: 10px; text-align: center; + border: 1px solid black; } nav .nav-notify.show { display: block; @@ -750,7 +752,7 @@ nav #nav-home-link, #nav-directory-link, #nav-apps-link{ margin-right: 0px; font-weight: bold; margin: 3px 5px; - font-size: 15px; + font-size: 14px; } nav #nav-directory-link{ margin-right: 0px; @@ -1034,6 +1036,8 @@ aside #profiles-menu { } aside #search-text { width: 173px; + height: 17px; + padding-left: 10px; border-top-left-radius: 15px; border-top-right-radius: 15px; border-bottom-right-radius: 15px; @@ -1204,6 +1208,10 @@ body .pageheader{ #birthday-notice, #event-notice, #birthday-wrapper, #event-wrapper{ margin-bottom: 10px; } + +#birthday-wrapper a { + color: #3465A4; + } /* wall item */ .tread-wrapper { border-bottom: 1px solid #D2D2D2; @@ -1665,6 +1673,7 @@ body .pageheader{ #profile-jot-submit { float: right; margin-top: 2px; + font-size: 14px; } #profile-upload-wrapper { @@ -1717,7 +1726,7 @@ body .pageheader{ float: right; margin-left: 10px; margin-top: 2px; - font-size: 10px; + font-size: 9px; font-weight: bolder; cursor: pointer; } @@ -1730,7 +1739,6 @@ body .pageheader{ .button.creation1 { background-color: #fff; border: 1px solid #777777; - background-image: -moz-linear-gradient(center top , white 0%, #DDDDDD 100%); border-radius: 3px 3px 3px 3px; box-shadow: 0 1px 1px #CFCFCF; font-weight: bolder; @@ -1738,7 +1746,6 @@ body .pageheader{ } .button.creation2 { background-color: #3465A4; - background-image: -moz-linear-gradient(center top , #66C1FF 0%, #0097FF 100%); border: 1px solid #777777; color: white; border-radius: 3px 3px 3px 3px; diff --git a/view/theme/diabook-red/communityhome.tpl b/view/theme/diabook-red/communityhome.tpl index cff75cd40a..cf8d81335a 100755 --- a/view/theme/diabook-red/communityhome.tpl +++ b/view/theme/diabook-red/communityhome.tpl @@ -17,7 +17,7 @@
{{ if $lastusers_title }}

Connectable Services

-
+
Facebook StatusNet LiveJournal diff --git a/view/theme/diabook-red/style-network.css b/view/theme/diabook-red/style-network.css index 545b0bcc09..d3e080bf5a 100644 --- a/view/theme/diabook-red/style-network.css +++ b/view/theme/diabook-red/style-network.css @@ -557,15 +557,17 @@ header #banner a:hover { outline: none; vertical-align: middle; font-weight: bolder; + } header #banner #logo-img { height: 25px; margin-top: 3px; } header #banner #logo-text { - font-size: 21px; + font-size: 20px; position: absolute; top: 10%; + margin-left: 3px; } /* nav */ nav { @@ -657,7 +659,7 @@ nav #logo-text { nav .nav-menu-search { position: relative; - margin: 3px 17px; + margin: 4px 17px; margin-right: 0px; height: 17px; width: 180px; @@ -718,7 +720,7 @@ nav .nav-menu.selected { nav .nav-notify { display: none; position: absolute; - background-color: #ff0000; + background-color: #fff; /* background-color: #19aeff; */ -moz-border-radius: 5px 5px 5px 5px; -webkit-border-radius: 5px 5px 5px 5px; @@ -1037,6 +1039,8 @@ aside #profiles-menu { } aside #search-text { width: 150px; + height: 17px; + padding-left: 10px; border-top-left-radius: 15px; border-top-right-radius: 15px; border-bottom-right-radius: 15px; @@ -1244,7 +1248,7 @@ right_aside { /* background: #F1F1F1; */ } -right_aside a{color: #ff500f;} +right_aside a{color: red;} right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 5px; margin-bottom: 0px; margin-top:30px;} right_aside .directory-item { width: 50px; height: 50px; vertical-align: center; text-align: center; } @@ -1256,6 +1260,7 @@ right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow: right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto; width: 100%; } #page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;} #page-sidebar-right_aside ul {margin-top: 0px;} +#page-sidebar-right_aside .label {max-width: 128px;} right_aside .icon {width: 10px; height: 10px;} .close_box { background-image: url("../../../view/theme/diabook-red/icons/close_box.png"); @@ -1741,7 +1746,7 @@ transition: all 0.2s ease-in-out; #profile-jot-submit { float: right; margin-top: 2px; - + font-size: 14px; } #profile-upload-wrapper { float: left; @@ -1793,7 +1798,7 @@ transition: all 0.2s ease-in-out; float: right; margin-left: 10px; margin-top: 2px; - font-size: 10px; + font-size: 9px; font-weight: bolder; cursor: pointer; } @@ -1806,7 +1811,6 @@ transition: all 0.2s ease-in-out; .button.creation1 { background-color: #fff; border: 1px solid #777777; - background-image: -moz-linear-gradient(center top , white 0%, #DDDDDD 100%); border-radius: 3px 3px 3px 3px; box-shadow: 0 1px 1px #CFCFCF; cursor: pointer; @@ -1814,7 +1818,6 @@ transition: all 0.2s ease-in-out; } .button.creation2 { background-color: #FF500F; - background-image: -moz-linear-gradient(center top , #66C1FF 0%, #0097FF 100%); border: 1px solid #777777; color: white; border-radius: 3px 3px 3px 3px; @@ -1824,12 +1827,14 @@ transition: all 0.2s ease-in-out; font-weight: bolder; } /*input[type="submit"] { - border: 0px; - background-color: @ButtonBackgroundColor; - color: @ButtonColor; - padding: 0px 10px; - .rounded(5px); - height: 18px; + background-color: #FF500F; + border: 1px solid #777777; + color: white; + border-radius: 3px 3px 3px 3px; + box-shadow: 0 1px 1px #CFCFCF; + margin-left: 5px; + cursor: pointer; + font-weight: bolder; }*/ /** acl **/ #photo-edit-perms-select, #photos-upload-permissions-wrapper, #profile-jot-acl-wrapper { diff --git a/view/theme/diabook-red/style-profile.css b/view/theme/diabook-red/style-profile.css index d24b2db689..5af75f2b5e 100644 --- a/view/theme/diabook-red/style-profile.css +++ b/view/theme/diabook-red/style-profile.css @@ -556,9 +556,10 @@ header #banner #logo-img { margin-top: 3px; } header #banner #logo-text { - font-size: 21px; + font-size: 20px; position: absolute; top: 10%; + margin-left: 3px; } /* nav */ nav { @@ -642,7 +643,7 @@ nav #logo-text { nav .nav-menu-search { position: relative; - margin: 3px 17px; + margin: 4px 17px; margin-right: 0px; height: 17px; width: 180px; @@ -703,7 +704,7 @@ nav .nav-menu.selected { nav .nav-notify { display: none; position: absolute; - background-color: #ff0000; + background-color: #fff; /* background-color: #19aeff; */ -moz-border-radius: 5px 5px 5px 5px; -webkit-border-radius: 5px 5px 5px 5px; @@ -1020,6 +1021,8 @@ aside #profiles-menu { } aside #search-text { width: 150px; + height: 17px; + padding-left: 10px; border-top-left-radius: 15px; border-top-right-radius: 15px; border-bottom-right-radius: 15px; @@ -1227,7 +1230,7 @@ right_aside { /* background: #F1F1F1; */ } -right_aside a{color: #ff500f;} +right_aside a{color: red;} right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 5px; margin-bottom: 0px; margin-top:30px;} right_aside .directory-item { width: 50px; height: 50px; vertical-align: center; text-align: center; } @@ -1239,6 +1242,7 @@ right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow: right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto; width: 100%; } #page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;} #page-sidebar-right_aside ul {margin-top: 0px;} +#page-sidebar-right_aside .label {max-width: 128px;} right_aside .icon {width: 10px; height: 10px;} .close_box { background-image: url("../../../view/theme/diabook-red/icons/close_box.png"); @@ -1719,6 +1723,7 @@ transition: all 0.2s ease-in-out; #profile-jot-submit { float: right; margin-top: 2px; + font-size: 14px; } #profile-upload-wrapper { @@ -1771,7 +1776,7 @@ transition: all 0.2s ease-in-out; float: right; margin-left: 10px; margin-top: 2px; - font-size: 10px; + font-size: 9px; font-weight: bolder; cursor: pointer; } @@ -1784,7 +1789,6 @@ transition: all 0.2s ease-in-out; .button.creation1 { background-color: #fff; border: 1px solid #777777; - background-image: -moz-linear-gradient(center top , white 0%, #DDDDDD 100%); border-radius: 3px 3px 3px 3px; box-shadow: 0 1px 1px #CFCFCF; font-weight: bolder; @@ -1792,7 +1796,6 @@ transition: all 0.2s ease-in-out; } .button.creation2 { background-color: #FF500F; - background-image: -moz-linear-gradient(center top , #66C1FF 0%, #0097FF 100%); border: 1px solid #777777; color: white; border-radius: 3px 3px 3px 3px; diff --git a/view/theme/diabook-red/style.css b/view/theme/diabook-red/style.css index d09144d05e..40b5b2ec32 100644 --- a/view/theme/diabook-red/style.css +++ b/view/theme/diabook-red/style.css @@ -561,9 +561,10 @@ header #banner #logo-img { margin-top: 3px; } header #banner #logo-text { - font-size: 21px; + font-size: 20px; position: absolute; top: 10%; + margin-left: 3px; } /* nav */ nav { @@ -655,7 +656,7 @@ nav #logo-text { nav .nav-menu-search { position: relative; - margin: 3px 17px; + margin: 4px 17px; margin-right: 0px; height: 17px; width: 180px; @@ -716,7 +717,7 @@ nav .nav-menu.selected { nav .nav-notify { display: none; position: absolute; - background-color: #ff0000; + background-color: #fff; /* background-color: #19aeff; */ -moz-border-radius: 5px 5px 5px 5px; -webkit-border-radius: 5px 5px 5px 5px; @@ -1034,6 +1035,8 @@ aside #profiles-menu { } aside #search-text { width: 173px; + height: 17px; + padding-left: 10px; border-top-left-radius: 15px; border-top-right-radius: 15px; border-bottom-right-radius: 15px; @@ -1665,7 +1668,7 @@ body .pageheader{ #profile-jot-submit { float: right; margin-top: 2px; - + font-size: 14px; } #profile-upload-wrapper { float: left; @@ -1717,7 +1720,7 @@ body .pageheader{ float: right; margin-left: 10px; margin-top: 2px; - font-size: 10px; + font-size: 9px; font-weight: bolder; cursor: pointer; } @@ -1730,7 +1733,6 @@ body .pageheader{ .button.creation1 { background-color: #fff; border: 1px solid #777777; - background-image: -moz-linear-gradient(center top , white 0%, #DDDDDD 100%); border-radius: 3px 3px 3px 3px; box-shadow: 0 1px 1px #CFCFCF; font-weight: bolder; @@ -1738,7 +1740,6 @@ body .pageheader{ } .button.creation2 { background-color: #FF500F; - background-image: -moz-linear-gradient(center top , #66C1FF 0%, #0097FF 100%); border: 1px solid #777777; color: white; border-radius: 3px 3px 3px 3px; diff --git a/view/theme/quattro-green/experimental b/view/theme/quattro-green/experimental deleted file mode 100755 index e69de29bb2..0000000000 diff --git a/view/theme/quattro-green/screenshot.png b/view/theme/quattro-green/screenshot.png deleted file mode 100644 index a764f4f9a7..0000000000 Binary files a/view/theme/quattro-green/screenshot.png and /dev/null differ diff --git a/view/theme/quattro-green/theme.php b/view/theme/quattro-green/theme.php deleted file mode 100644 index 77297ddda0..0000000000 --- a/view/theme/quattro-green/theme.php +++ /dev/null @@ -1,55 +0,0 @@ - - * Maintainer: Tobias Diekershoff - */ -$a->theme_info = array( - 'extends' => 'quattro', -); - -$a->hooks[] = array('plugin_settings', 'view/theme/quattro-green/theme.php', 'quattro_green_settings'); -$a->hooks[] = array('plugin_settings_post', 'view/theme/quattro-green/theme.php', 'quattro_green_settings_post'); - - -function quattro_green_settings(&$a, &$o){ - if(!local_user()) - return; - - $align = get_pconfig(local_user(), 'quattro', 'align' ); - - $t = file_get_contents( dirname(__file__). "/theme_settings.tpl" ); - $o .= replace_macros($t, array( - '$submit' => t('Submit'), - '$baseurl' => $a->get_baseurl(), - '$title' => t("Theme settings"), - '$align' => array('quattro_align', t('Alignment'), $align, '', array('left'=>t('Left'), 'center'=>t('Center'))), - )); -} - -function quattro_green_settings_post(&$a){ - if(! local_user()) - return; - if (isset($_POST['quattro-settings-submit'])){ - set_pconfig(local_user(), 'quattro', 'align', $_POST['quattro_align']); - } - goaway($a->get_baseurl()."/settings/addon"); -} - - -$quattro_align = get_pconfig(local_user(), 'quattro', 'align' ); - -if(local_user() && $quattro_align=="center"){ - - $a->page['htmlhead'].=" - - "; - -} diff --git a/view/theme/quattro-green/theme_settings.tpl b/view/theme/quattro-green/theme_settings.tpl deleted file mode 100644 index 25af042530..0000000000 --- a/view/theme/quattro-green/theme_settings.tpl +++ /dev/null @@ -1,11 +0,0 @@ -
-

$title

- - {{inc field_select.tpl with $field=$align}}{{endinc}} - -
- -
- - -
diff --git a/view/theme/quattro/config.php b/view/theme/quattro/config.php new file mode 100644 index 0000000000..c9ab3a4a14 --- /dev/null +++ b/view/theme/quattro/config.php @@ -0,0 +1,39 @@ +"Quattro", + "green"=>"Green" + ); + + $t = file_get_contents( dirname(__file__). "/theme_settings.tpl" ); + $o .= replace_macros($t, array( + '$submit' => t('Submit'), + '$baseurl' => $a->get_baseurl(), + '$title' => t("Theme settings"), + '$align' => array('quattro_align', t('Alignment'), $align, '', array('left'=>t('Left'), 'center'=>t('Center'))), + '$color' => array('quattro_color', t('Color scheme'), $color, '', $colors), + )); + return $o; +} + +function theme_post(&$a){ + if(! local_user()) + return; + + if (isset($_POST['quattro-settings-submit'])){ + set_pconfig(local_user(), 'quattro', 'align', $_POST['quattro_align']); + set_pconfig(local_user(), 'quattro', 'color', $_POST['quattro_color']); + } +} + diff --git a/view/theme/quattro/dark/Makefile b/view/theme/quattro/dark/Makefile new file mode 100644 index 0000000000..989da60c72 --- /dev/null +++ b/view/theme/quattro/dark/Makefile @@ -0,0 +1,4 @@ +## + +style.css : style.less colors.less ../icons.less ../quattro.less + lessc style.less > style.css diff --git a/view/theme/quattro/colors.less b/view/theme/quattro/dark/colors.less similarity index 100% rename from view/theme/quattro/colors.less rename to view/theme/quattro/dark/colors.less diff --git a/view/theme/quattro/style.css b/view/theme/quattro/dark/style.css similarity index 97% rename from view/theme/quattro/style.css rename to view/theme/quattro/dark/style.css index 7d7444e481..1d951aba84 100755 --- a/view/theme/quattro/style.css +++ b/view/theme/quattro/dark/style.css @@ -231,7 +231,8 @@ body { h4 { font-size: 1.1em; } -a, a:link { +a, +a:link { color: #005c94; text-decoration: none; } @@ -449,7 +450,8 @@ nav #nav-site-linkmenu .menu-popup { right: 0px; left: auto; } -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"); } nav #nav-apps-link.selected { @@ -627,11 +629,15 @@ aside #profiles-menu { height: 48px; } /* group member */ -#contact-edit-drop-link, .mail-list-delete-wrapper, .group-delete-wrapper { +#contact-edit-drop-link, +.mail-list-delete-wrapper, +.group-delete-wrapper { float: right; margin-right: 50px; } -#contact-edit-drop-link .drophide, .mail-list-delete-wrapper .drophide, .group-delete-wrapper .drophide { +#contact-edit-drop-link .drophide, +.mail-list-delete-wrapper .drophide, +.group-delete-wrapper .drophide { background-image: url('../../../images/icons/22/delete.png'); display: block; width: 22px; @@ -640,7 +646,9 @@ aside #profiles-menu { position: relative; top: -50px; } -#contact-edit-drop-link .drop, .mail-list-delete-wrapper .drop, .group-delete-wrapper .drop { +#contact-edit-drop-link .drop, +.mail-list-delete-wrapper .drop, +.group-delete-wrapper .drop { background-image: url('../../../images/icons/22/delete.png'); display: block; width: 22px; @@ -769,7 +777,8 @@ section { display: table; width: 780px; } -.wall-item-container .wall-item-item, .wall-item-container .wall-item-bottom { +.wall-item-container .wall-item-item, +.wall-item-container .wall-item-bottom { display: table-row; } .wall-item-container .wall-item-bottom { @@ -807,11 +816,13 @@ section { .wall-item-container .wall-item-content img { max-width: 710px; } -.wall-item-container .wall-item-links, .wall-item-container .wall-item-actions { +.wall-item-container .wall-item-links, +.wall-item-container .wall-item-actions { display: table-cell; vertical-align: middle; } -.wall-item-container .wall-item-links .icon, .wall-item-container .wall-item-actions .icon { +.wall-item-container .wall-item-links .icon, +.wall-item-container .wall-item-actions .icon { opacity: 0.5; -webkit-transition: all 0.2s ease-in-out; -moz-transition: all 0.2s ease-in-out; @@ -819,7 +830,8 @@ section { -ms-transition: all 0.2s ease-in-out; transition: all 0.2s ease-in-out; } -.wall-item-container .wall-item-links .icon:hover, .wall-item-container .wall-item-actions .icon:hover { +.wall-item-container .wall-item-links .icon:hover, +.wall-item-container .wall-item-actions .icon:hover { opacity: 1; -webkit-transition: all 0.2s ease-in-out; -moz-transition: all 0.2s ease-in-out; @@ -944,9 +956,6 @@ section { opacity: 0.5; } .wwto { - position: absolute !important; - width: 25px; - height: 25px; background: #FFFFFF; border: 2px solid #364e59; height: 25px; @@ -1164,7 +1173,9 @@ section { height: 18px; }*/ /** 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 { display: block!important; } #acl-wrapper { @@ -1323,10 +1334,12 @@ ul.tabs li .active { float: left; width: 200px; } -.field input, .field textarea { +.field input, +.field textarea { width: 400px; } -.field input[type="checkbox"], .field input[type="radio"] { +.field input[type="checkbox"], +.field input[type="radio"] { width: auto; } .field textarea { diff --git a/view/theme/quattro/style.less b/view/theme/quattro/dark/style.less similarity index 80% rename from view/theme/quattro/style.less rename to view/theme/quattro/dark/style.less index c3dbae7778..7d81e788a9 100755 --- a/view/theme/quattro/style.less +++ b/view/theme/quattro/dark/style.less @@ -6,8 +6,8 @@ // $ lessc style.less > style.css @import "colors"; -@import "icons"; -@import "quattro"; +@import "../icons"; +@import "../quattro"; diff --git a/view/theme/quattro/green/Makefile b/view/theme/quattro/green/Makefile new file mode 100644 index 0000000000..989da60c72 --- /dev/null +++ b/view/theme/quattro/green/Makefile @@ -0,0 +1,4 @@ +## + +style.css : style.less colors.less ../icons.less ../quattro.less + lessc style.less > style.css diff --git a/view/theme/quattro-green/colors.less b/view/theme/quattro/green/colors.less similarity index 100% rename from view/theme/quattro-green/colors.less rename to view/theme/quattro/green/colors.less diff --git a/view/theme/quattro-green/style.css b/view/theme/quattro/green/style.css similarity index 97% rename from view/theme/quattro-green/style.css rename to view/theme/quattro/green/style.css index 8e3ddd9b89..e7cc549d07 100755 --- a/view/theme/quattro-green/style.css +++ b/view/theme/quattro/green/style.css @@ -231,7 +231,8 @@ body { h4 { font-size: 1.1em; } -a, a:link { +a, +a:link { color: #009100; text-decoration: none; } @@ -449,7 +450,8 @@ nav #nav-site-linkmenu .menu-popup { right: 0px; left: auto; } -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"); } nav #nav-apps-link.selected { @@ -627,11 +629,15 @@ aside #profiles-menu { height: 48px; } /* group member */ -#contact-edit-drop-link, .mail-list-delete-wrapper, .group-delete-wrapper { +#contact-edit-drop-link, +.mail-list-delete-wrapper, +.group-delete-wrapper { float: right; margin-right: 50px; } -#contact-edit-drop-link .drophide, .mail-list-delete-wrapper .drophide, .group-delete-wrapper .drophide { +#contact-edit-drop-link .drophide, +.mail-list-delete-wrapper .drophide, +.group-delete-wrapper .drophide { background-image: url('../../../images/icons/22/delete.png'); display: block; width: 22px; @@ -640,7 +646,9 @@ aside #profiles-menu { position: relative; top: -50px; } -#contact-edit-drop-link .drop, .mail-list-delete-wrapper .drop, .group-delete-wrapper .drop { +#contact-edit-drop-link .drop, +.mail-list-delete-wrapper .drop, +.group-delete-wrapper .drop { background-image: url('../../../images/icons/22/delete.png'); display: block; width: 22px; @@ -769,7 +777,8 @@ section { display: table; width: 780px; } -.wall-item-container .wall-item-item, .wall-item-container .wall-item-bottom { +.wall-item-container .wall-item-item, +.wall-item-container .wall-item-bottom { display: table-row; } .wall-item-container .wall-item-bottom { @@ -807,11 +816,13 @@ section { .wall-item-container .wall-item-content img { max-width: 710px; } -.wall-item-container .wall-item-links, .wall-item-container .wall-item-actions { +.wall-item-container .wall-item-links, +.wall-item-container .wall-item-actions { display: table-cell; vertical-align: middle; } -.wall-item-container .wall-item-links .icon, .wall-item-container .wall-item-actions .icon { +.wall-item-container .wall-item-links .icon, +.wall-item-container .wall-item-actions .icon { opacity: 0.5; -webkit-transition: all 0.2s ease-in-out; -moz-transition: all 0.2s ease-in-out; @@ -819,7 +830,8 @@ section { -ms-transition: all 0.2s ease-in-out; transition: all 0.2s ease-in-out; } -.wall-item-container .wall-item-links .icon:hover, .wall-item-container .wall-item-actions .icon:hover { +.wall-item-container .wall-item-links .icon:hover, +.wall-item-container .wall-item-actions .icon:hover { opacity: 1; -webkit-transition: all 0.2s ease-in-out; -moz-transition: all 0.2s ease-in-out; @@ -944,9 +956,6 @@ section { opacity: 0.5; } .wwto { - position: absolute !important; - width: 25px; - height: 25px; background: #FFFFFF; border: 2px solid #364e59; height: 25px; @@ -1164,7 +1173,9 @@ section { height: 18px; }*/ /** 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 { display: block!important; } #acl-wrapper { @@ -1323,10 +1334,12 @@ ul.tabs li .active { float: left; width: 200px; } -.field input, .field textarea { +.field input, +.field textarea { width: 400px; } -.field input[type="checkbox"], .field input[type="radio"] { +.field input[type="checkbox"], +.field input[type="radio"] { width: auto; } .field textarea { diff --git a/view/theme/quattro-green/style.less b/view/theme/quattro/green/style.less similarity index 75% rename from view/theme/quattro-green/style.less rename to view/theme/quattro/green/style.less index f8b0bb31cc..7d81e788a9 100755 --- a/view/theme/quattro-green/style.less +++ b/view/theme/quattro/green/style.less @@ -6,8 +6,8 @@ // $ lessc style.less > style.css @import "colors"; -@import "../quattro/icons"; -@import "../quattro/quattro"; +@import "../icons"; +@import "../quattro"; diff --git a/view/theme/quattro/screenshot.jpg b/view/theme/quattro/screenshot.jpg index 7f50ec70e9..98fbfe2ea6 100644 Binary files a/view/theme/quattro/screenshot.jpg and b/view/theme/quattro/screenshot.jpg differ diff --git a/view/theme/quattro/style.php b/view/theme/quattro/style.php new file mode 100644 index 0000000000..889ec1530e --- /dev/null +++ b/view/theme/quattro/style.php @@ -0,0 +1,9 @@ +hooks[] = array('plugin_settings', 'view/theme/quattro/theme.php', 'quattro_settings'); -$a->hooks[] = array('plugin_settings_post', 'view/theme/quattro/theme.php', 'quattro_settings_post'); -function quattro_settings(&$a, &$o){ - if(!local_user()) - return; - - $align = get_pconfig(local_user(), 'quattro', 'align' ); - - $t = file_get_contents( dirname(__file__). "/theme_settings.tpl" ); - $o .= replace_macros($t, array( - '$submit' => t('Submit'), - '$baseurl' => $a->get_baseurl(), - '$title' => t("Theme settings"), - '$align' => array('quattro_align', t('Alignment'), $align, '', array('left'=>t('Left'), 'center'=>t('Center'))), - )); -} - -function quattro_settings_post(&$a){ - if(! local_user()) - return; - if (isset($_POST['quattro-settings-submit'])){ - set_pconfig(local_user(), 'quattro', 'align', $_POST['quattro_align']); - } - goaway($a->get_baseurl()."/settings/addon"); -} - $quattro_align = get_pconfig(local_user(), 'quattro', 'align' ); diff --git a/view/theme/quattro/theme_settings.tpl b/view/theme/quattro/theme_settings.tpl index 25af042530..9771ae1621 100644 --- a/view/theme/quattro/theme_settings.tpl +++ b/view/theme/quattro/theme_settings.tpl @@ -1,11 +1,8 @@ -
-

$title

- - {{inc field_select.tpl with $field=$align}}{{endinc}} - -
- -
+{{inc field_select.tpl with $field=$color}}{{endinc}} - +{{inc field_select.tpl with $field=$align}}{{endinc}} + +
+
+