From 5426c4ec6a8691969fbb704056ea87ad85021b79 Mon Sep 17 00:00:00 2001 From: sarven Date: Sun, 18 Jan 2009 19:58:28 +0000 Subject: Using config site name for creative commons bit. Fix i18n. --- lib/action.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'lib/action.php') diff --git a/lib/action.php b/lib/action.php index e62a032b6..320814a8a 100644 --- a/lib/action.php +++ b/lib/action.php @@ -439,7 +439,8 @@ class Action extends HTMLOutputter // lawsuit $this->element('img', array('id' => 'license_cc', 'src' => common_config('license', 'image'), 'alt' => common_config('license', 'title'))); - $this->text(_('All criti.ca content and data are available under the ')); + //TODO: This is dirty: i18n + $this->text(_('All '.common_config('site', 'name').' content and data are available under the ')); $this->element('a', array('class' => 'license', 'rel' => 'external license', 'href' => common_config('license', 'url')), -- cgit v1.2.3-54-g00ecf From 9d384aadb1f27cea85d23c944f787cf300a4389a Mon Sep 17 00:00:00 2001 From: sarven Date: Sun, 18 Jan 2009 22:08:51 +0000 Subject: @id for site_nav_global_primary items in order to target for styling --- actions/register.php | 1 + lib/action.php | 22 +++++++++++++--------- theme/identica/css/display.css | 19 ++++++++++++++++--- 3 files changed, 30 insertions(+), 12 deletions(-) (limited to 'lib/action.php') diff --git a/actions/register.php b/actions/register.php index f0d47f19b..08243c1e2 100644 --- a/actions/register.php +++ b/actions/register.php @@ -399,6 +399,7 @@ class RegisterAction extends Action $this->elementEnd('li'); $attrs = array('type' => 'checkbox', 'id' => 'license', + 'class' => 'checkbox', 'name' => 'license', 'value' => 'true'); if ($this->boolean('license')) { diff --git a/lib/action.php b/lib/action.php index 320814a8a..3d61afde2 100644 --- a/lib/action.php +++ b/lib/action.php @@ -242,25 +242,29 @@ class Action extends HTMLOutputter // lawsuit $this->elementStart('ul', array('class' => 'nav')); if ($user) { $this->menuItem(common_local_url('all', array('nickname' => $user->nickname)), - _('Home')); + _('Home'), _('Personal timeline'), false, 'nav_home'); } - $this->menuItem(common_local_url('peoplesearch'), _('Search')); + $this->menuItem(common_local_url('peoplesearch'), + _('Search'), _('Search the site for people and text'), false, 'nav_search'); if ($user) { $this->menuItem(common_local_url('profilesettings'), - _('Account')); + _('Account'), _('Account settings'), false, 'nav_account'); $this->menuItem(common_local_url('imsettings'), - _('Connect')); + _('Connect'), _('Connect settings'), false, 'nav_connect'); $this->menuItem(common_local_url('logout'), - _('Logout')); + _('Logout'), _('Logout from the site'), false, 'nav_logout'); } else { - $this->menuItem(common_local_url('login'), _('Login')); + $this->menuItem(common_local_url('login'), + _('Login'), _('Login to the site'), false, 'nav_login'); if (!common_config('site', 'closed')) { - $this->menuItem(common_local_url('register'), _('Register')); + $this->menuItem(common_local_url('register'), + _('Register'), _('Create an account'), false, 'nav_register'); } - $this->menuItem(common_local_url('openidlogin'), _('OpenID')); + $this->menuItem(common_local_url('openidlogin'), + _('OpenID'), _('Login with OpenID'), false, 'nav_openid'); } $this->menuItem(common_local_url('doc', array('title' => 'help')), - _('Help')); + _('Help'), _('Help me!'), false, 'nav_help'); $this->elementEnd('ul'); $this->elementEnd('dd'); $this->elementEnd('dl'); diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css index 0235c2d7d..a5b177004 100644 --- a/theme/identica/css/display.css +++ b/theme/identica/css/display.css @@ -57,6 +57,21 @@ background-color:transparent; } +#site_nav_global_primary a { +} + +#nav_register a { +background-color:#A9BF4F; +color:#fff; +text-decoration:none; +font-weight:bold; +padding:2px 4px; + +} +#nav_login a { +} + + #site_nav_local_views a { border-color:#fff; background-color:rgba(255, 255, 255, 0.2); @@ -71,6 +86,7 @@ background-color:rgba(255, 255, 255, 0.7); background-color:#fff; } + #page_notice .error { background-color:#F7E8E8; } @@ -78,9 +94,6 @@ background-color:#F7E8E8; background-color:#EFF3DC; } - - - #export_data li a { background-repeat:no-repeat; background-position:0 45%; -- cgit v1.2.3-54-g00ecf From 910bd332430b0af233ae78b330994520d4b59c97 Mon Sep 17 00:00:00 2001 From: sarven Date: Mon, 19 Jan 2009 00:10:42 +0000 Subject: Minimal cross browser styling (mostly IE7). w00t! --- lib/action.php | 2 +- theme/base/css/display.css | 28 ++++++++++++++++++---------- theme/identica/css/display.css | 18 +++++++++++++++--- 3 files changed, 34 insertions(+), 14 deletions(-) (limited to 'lib/action.php') diff --git a/lib/action.php b/lib/action.php index 3d61afde2..c463c8459 100644 --- a/lib/action.php +++ b/lib/action.php @@ -138,7 +138,7 @@ class Action extends HTMLOutputter // lawsuit if (file_exists(theme_file('ie'.$ver.'.css'))) { // Yes, IE people should be put in jail. $this->comment('[if lte IE '.$ver.']> Date: Mon, 19 Jan 2009 00:48:12 +0000 Subject: Cross-browser stuff --- lib/action.php | 2 ++ theme/base/css/display.css | 35 ++++++++++++++++++++++++++++++----- theme/base/css/ie.css | 26 ++++++++++++++++++++++++++ theme/base/css/ie7.css | 5 +++++ theme/identica/css/display.css | 4 ++++ 5 files changed, 67 insertions(+), 5 deletions(-) create mode 100644 theme/base/css/ie.css create mode 100644 theme/base/css/ie7.css (limited to 'lib/action.php') diff --git a/lib/action.php b/lib/action.php index c463c8459..9cd2d5a18 100644 --- a/lib/action.php +++ b/lib/action.php @@ -134,6 +134,8 @@ class Action extends HTMLOutputter // lawsuit 'type' => 'text/css', 'href' => theme_path('css/display.css', null) . '?version=' . LACONICA_VERSION, 'media' => 'screen, projection, tv')); + $this->comment('[if IE]>