Merge branch 'uiredesign' of /var/www/trunk into uiredesign

actions/disfavor.php

@@ -69,7 +69,7 @@ class DisfavorAction extends Action
         $user->blowFavesCache();
 
         if ($this->boolean('ajax')) {
-            common_start_html('text/xml;charset=utf-8', true);
+            $this->startHTML('text/xml;charset=utf-8', true);
             $this->elementStart('head');
             $this->element('title', null, _('Add to favorites'));
             $this->elementEnd('head');

actions/favor.php

@@ -68,7 +68,7 @@ class FavorAction extends Action
         $user->blowFavesCache();
         
         if ($this->boolean('ajax')) {
-            common_start_html('text/xml;charset=utf-8', true);
+            $this->startHTML('text/xml;charset=utf-8', true);
             $this->elementStart('head');
             $this->element('title', null, _('Disfavor favorite'));
             $this->elementEnd('head');

actions/login.php

@@ -107,13 +107,13 @@ class LoginAction extends Action
 
     function showForm($error=null)
     {
-	$this->error = $error;
-	$this->showPage();
+        $this->error = $error;
+        $this->showPage();
     }
 
     function title()
     {
-	return _('Login');
+        return _('Login');
     }
 
     function showPageNotice()
@@ -131,7 +131,7 @@ class LoginAction extends Action
     {      
         $this->elementStart('form', array('method' => 'post',
                                            'id' => 'form_login',
-                                           'class' => 'form_login',
+                                           'class' => 'form_settings',
                                            'action' => common_local_url('login')));
         $this->elementStart('fieldset');
         $this->element('legend', null, _('Login to site'));

actions/othersettings.php

@@ -83,11 +83,14 @@ class OthersettingsAction extends AccountSettingsAction
     {
         $user = common_current_user();
 
-        $this->element('h2', null, _('URL Auto-shortening'));
+
         $this->elementStart('form', array('method' => 'post',
-                                          'id' => 'othersettings',
+                                          'id' => 'form_settings_other',
+                                          'class' => 'form_settings',
                                           'action' =>
                                           common_local_url('othersettings')));
+        $this->elementStart('fieldset');
+        $this->element('legend', null, _('URL Auto-shortening'));
         $this->hidden('token', common_session_token());
 
         // I18N
@@ -104,12 +107,15 @@ class OthersettingsAction extends AccountSettingsAction
                           'metamark.net' => 'metamark.net'
                           );
 
+        $this->elementStart('ul', 'form_datas');
+        $this->elementStart('li');
         $this->dropdown('urlshorteningservice', _('Service'),
                         $services, _('Automatic shortening service to use.'),
                         false, $user->urlshorteningservice);
-
+        $this->elementEnd('li');
+        $this->elementEnd('ul');
         $this->submit('save', _('Save'));
-
+        $this->elementEnd('fieldset');
         $this->elementEnd('form');
     }
 

actions/profilesettings.php

@@ -84,52 +84,72 @@ class ProfilesettingsAction extends AccountSettingsAction
         $profile = $user->getProfile();
 
         $this->elementStart('form', array('method' => 'POST',
-                                           'id' => 'profilesettings',
+                                           'id' => 'form_settings_profile',
+                                           'class' => 'form_settings',
                                            'action' => common_local_url('profilesettings')));
+        $this->elementStart('fieldset');
+        $this->element('legend', null, _('Profile information'));
         $this->hidden('token', common_session_token());
 
         # too much common patterns here... abstractable?
 
+        $this->elementStart('ul', 'form_datas');
+        $this->elementStart('li');
         $this->input('nickname', _('Nickname'),
                      ($this->arg('nickname')) ? $this->arg('nickname') : $profile->nickname,
                      _('1-64 lowercase letters or numbers, no punctuation or spaces'));
+        $this->elementEnd('li');
+        $this->elementStart('li');
         $this->input('fullname', _('Full name'),
                      ($this->arg('fullname')) ? $this->arg('fullname') : $profile->fullname);
+        $this->elementEnd('li');
+        $this->elementStart('li');
         $this->input('homepage', _('Homepage'),
                      ($this->arg('homepage')) ? $this->arg('homepage') : $profile->homepage,
                      _('URL of your homepage, blog, or profile on another site'));
+        $this->elementEnd('li');
+        $this->elementStart('li');
         $this->textarea('bio', _('Bio'),
                         ($this->arg('bio')) ? $this->arg('bio') : $profile->bio,
                         _('Describe yourself and your interests in 140 chars'));
+        $this->elementEnd('li');
+        $this->elementStart('li');
         $this->input('location', _('Location'),
                      ($this->arg('location')) ? $this->arg('location') : $profile->location,
                      _('Where you are, like "City, State (or Region), Country"'));
+        $this->elementEnd('li');
+        $this->elementStart('li');
         $this->input('tags', _('Tags'),
                      ($this->arg('tags')) ? $this->arg('tags') : implode(' ', $user->getSelfTags()),
                      _('Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated'));
-
+        $this->elementEnd('li');
+        $this->elementStart('li');
         $language = common_language();
         $this->dropdown('language', _('Language'),
                         get_nice_language_list(), _('Preferred language'),
                         true, $language);
-
+        $this->elementEnd('li');
         $timezone = common_timezone();
         $timezones = array();
         foreach(DateTimeZone::listIdentifiers() as $k => $v) {
             $timezones[$v] = $v;
         }
+        $this->elementStart('li');
         $this->dropdown('timezone', _('Timezone'),
                         $timezones, _('What timezone are you normally in?'),
                         true, $timezone);
-
+        $this->elementEnd('li');
+        $this->elementStart('li');
         $this->checkbox('autosubscribe',
                         _('Automatically subscribe to whoever '.
                           'subscribes to me (best for non-humans)'),
                         ($this->arg('autosubscribe')) ?
                         $this->boolean('autosubscribe') : $user->autosubscribe);
-
+        $this->elementEnd('li');
+        $this->elementEnd('ul');
         $this->submit('save', _('Save'));
 
+        $this->elementEnd('fieldset');
         $this->elementEnd('form');
 
     }

js/util.js

@@ -81,10 +81,10 @@ $(document).ready(function(){
 		this.appendChild(ajax);
 	}
 
-	$("form.favor").ajaxForm(favoptions);
-	$("form.disfavor").ajaxForm(disoptions);
-	$("form.favor").each(addAjaxHidden);
-	$("form.disfavor").each(addAjaxHidden);
+	$("form.form_favor").ajaxForm(favoptions);
+	$("form.form_disfavor").ajaxForm(disoptions);
+	$("form.form_favor").each(addAjaxHidden);
+	$("form.form_disfavor").each(addAjaxHidden);
 
 	$("#nudge").ajaxForm ({ dataType: 'xml',
 							beforeSubmit: function(xml) { $("form#nudge input[type=submit]").attr("disabled", "disabled");

lib/disfavorform.php

@@ -88,7 +88,7 @@ class DisfavorForm extends Form
 
     function action()
     {
-        common_local_url('disfavor');
+        return common_local_url('disfavor');
     }
 
     /**
@@ -136,7 +136,7 @@ class DisfavorForm extends Form
 
     function formClass()
     {
-	return 'disfavor';
+        return 'form_disfavor';
     }
 
-}
+}

lib/favorform.php

@@ -88,7 +88,7 @@ class FavorForm extends Form
 
     function action()
     {
-        common_local_url('favor');
+        return common_local_url('favor');
     }
 
     /**
@@ -148,6 +148,6 @@ class FavorForm extends Form
     
     function formClass()
     {
-	return 'notice_favorite';
+        return 'form_favor';
     }
 }

theme/base/css/display.css

@@ -17,7 +17,7 @@ width:1004px;
 width:71.714em;
 }
 h1 {
-font-size:2.1em;
+font-size:1.7em;
 line-height:1.1;
 margin-bottom:0.25em;
 }
@@ -39,7 +39,7 @@ font-weight:bold;
 
 legend {
 font-weight:bold; 
-font-size:1.6em;
+font-size:1.5em;
 text-transform:uppercase;
 }
 form {
@@ -109,9 +109,21 @@ margin-bottom:29px;
 font-style:italic;
 }
 
-.form_login label,
-.form_settings label {
+
+.form_settings .form_datas li {
+width:100%;
+float:left;
+}
+
+.form_settings .form_datas label,
+.form_settings .form_datas input {
 margin-right:11px;
+float:left;
+}
+
+.form_settings label {
+margin-top:7px;
+width:123px;
 }
 
 .form_actions label {
@@ -123,16 +135,37 @@ display:inline;
 font-weight:bold;
 }
 
+#form_settings_profile legend {
+display:none;
+}
+
+.form_settings .form_datas p.form_guide {
+clear:both;
+margin-left:134px;
+margin-bottom:0;
+}
+
 .form_settings p {
-margin-bottom:18px;
+margin-bottom:11px;
 }
 
-#settings_email_address {
-margin-bottom:29px;
+.form_settings input.checkbox {
+margin-top:3px;
 }
-
 .form_settings label.checkbox {
 font-weight:normal;
+width:auto;
+margin-top:0;
+}
+
+#form_login p.form_guide {
+margin-left:0;
+}
+
+
+.form_settings .form_note {
+-moz-border-radius:4px;
+padding:0 7px;
 }
 
 /* FORM SETTINGS */
@@ -715,6 +748,7 @@ display:inline;
 clear:left;
 float:left;
 width:48%;
+font-size:0.95em;
 }
 .notice div.entry-content a,
 .notice .notice-options a,
@@ -724,6 +758,7 @@ width:48%;
 .notice .notice-options a,
 .notice .notice-options input {
 float:left;
+font-size:1.025em;
 }
 
 #laconicat .notice div.entry-content {
@@ -740,7 +775,7 @@ display:inline;
 display:none;
 }
 .notice div.entry-content .timestamp a {
-
+display:inline-block;
 }
 .notice div.entry-content .device dt {
 text-transform:lowercase;
@@ -773,13 +808,29 @@ outline:none;
 padding-left:2%;
 float:left;
 width:50%;
+position:relative;
+font-size:0.95em;
 }
-.notice-options .notice_reply,
-.notice-options .notice_favorite {
+
+.notice-options a {
 float:left;
-margin-right:11px;
+}
+.notice-options .notice_delete,
+.notice-options .notice_reply,
+.notice-options .form_favor,
+.notice-options .form_disfavor {
+position:absolute;
+top:0;
+}
+.notice-options .form_favor,
+.notice-options .form_disfavor {
+left:0;
 }
 .notice-options .notice_reply {
+left:29px;
+}
+.notice-options .notice_delete {
+left:76px;
 }
 .notice-options .notice_reply dt {
 display:none;
@@ -788,6 +839,7 @@ display:none;
 .notice-options input,
 .notice-options a {
 text-indent:-9999px;
+outline:none;
 }
 
 .notice-options .notice_reply a,
@@ -798,24 +850,24 @@ border:0;
 .notice-options .notice_reply a,
 .notice-options .notice_delete a {
 text-decoration:none;
-padding-left:20px;
+padding-left:16px;
 }
 
 .notice-options .notice_delete {
-float:right;
+
 }
 
 .notice-options form input.submit {
 cursor:pointer;
-padding:2px 0 2px 17px;
+padding:2px 0 2px 10px;
 }
 
 .notice-options .notice_delete dt,
-.notice-options .notice_favorite legend {
+.notice-options .form_favor legend {
 display:none;
 }
 .notice-options .notice_delete fieldset,
-.notice-options .notice_favorite fieldset {
+.notice-options .form_favor fieldset {
 border:0;
 padding:0;
 }

theme/identica/css/display.css

@@ -62,7 +62,7 @@ border-color:#fff;
 background-color:rgba(255, 255, 255, 0.2);
 }
 #site_nav_local_views a:hover {
-background-color:rgba(255, 255, 255, 0.7);:
+background-color:rgba(255, 255, 255, 0.7);
 }
 
 
@@ -87,7 +87,7 @@ background-image:url(../../base/images/icons/icon_atom.jpg);
 }
 #export_data li a.foaf {
 background-image:url(../../base/images/icons/icon_foaf.gif);
-=}
+}
 #export_data li a.export_vcard {
 background-image:url(../../base/images/icons/icon_vcard.gif);
 }
@@ -173,19 +173,23 @@ background-color:transparent;
 .notice-options .notice_reply a {
 background:transparent url(../images/icons/twotone/green/reply.gif) no-repeat 0 45%;
 }
-.notice-options form.notice_favorite input.submit {
+.notice-options form.form_favor input.submit {
 background:transparent url(../images/icons/twotone/green/favourite.gif) no-repeat 0 45%;
 }
+.notice-options form.form_disfavor input.submit {
+background:transparent url(../images/icons/twotone/green/disfavourite.gif) no-repeat 0 45%;
+}
 .notice-options .notice_delete a {
 background:transparent url(../images/icons/twotone/green/trash.gif) no-repeat 0 45%;
 }
 
-div.entry-content,
 div.notice-options {
-opacity:0.2;
-font-family:sans-serif;
+opacity:0.3;
+}
+
+div.entry-content {
+color:#333;
 }
-div.entry-content a,
 div.notice-options a,
 div.notice-options input {
 font-family:sans-serif;
@@ -202,6 +206,9 @@ background-color:#fcfcfc;
 opacity:1;
 }
 
+.form_settings .form_note {
+background-color:#A9BF4F;
+}
 
 /*END: NOTICES */