Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into upload

Conflicts:

	js/util.js
	lib/attachmentlist.php

4 files changed, 10 insertions, 9 deletions

diff --git a/actions/api.php b/actions/api.php
index 8762b4bcd..b25ba99f3 100644
--- a/actions/api.php
+++ b/actions/api.php
@@ -67,6 +67,7 @@ class ApiAction extends Action
                     $this->process_command();
                 } else {
                     # basic authentication failed
+                    common_log(LOG_WARNING, "Failed API auth attempt, nickname: $nickname.");
                     $this->show_basic_auth_error();
                 }
             }
diff --git a/actions/conversation.php b/actions/conversation.php
index ef189016a..0d7cb9a87 100644
--- a/actions/conversation.php
+++ b/actions/conversation.php
@@ -179,14 +179,14 @@ class ConversationTree extends NoticeList
 
         $this->out->elementStart('div', array('id' =>'notices_primary'));
         $this->out->element('h2', null, _('Notices'));
-        $this->out->elementStart('ul', array('class' => 'notices'));
+        $this->out->elementStart('ol', array('class' => 'notices xoxo'));
 
         if (array_key_exists('root', $this->tree)) {
             $rootid = $this->tree['root'][0];
             $this->showNoticePlus($rootid);
         }
 
-        $this->out->elementEnd('ul');
+        $this->out->elementEnd('ol');
         $this->out->elementEnd('div');
 
         return $cnt;
@@ -215,13 +215,13 @@ class ConversationTree extends NoticeList
         if (array_key_exists($id, $this->tree)) {
             $children = $this->tree[$id];
 
-            $this->out->elementStart('ul', array('class' => 'notices'));
+            $this->out->elementStart('ol', array('class' => 'notices'));
 
             foreach ($children as $child) {
                 $this->showNoticePlus($child);
             }
 
-            $this->out->elementEnd('ul');
+            $this->out->elementEnd('ol');
         }
 
         $this->out->elementEnd('li');
@@ -295,4 +295,4 @@ class ConversationTreeItem extends NoticeListItem
     {
         return;
     }
-}
\ No newline at end of file
+}
diff --git a/actions/designsettings.php b/actions/designsettings.php
index 315e5a199..5774b8537 100644
--- a/actions/designsettings.php
+++ b/actions/designsettings.php
@@ -70,7 +70,7 @@ class DesignsettingsAction extends AccountSettingsAction
     function showContent()
     {
         $user = common_current_user();
-        $this->elementStart('form', array('method' => 'POST',
+        $this->elementStart('form', array('method' => 'post',
                                           'id' => 'form_settings_design',
                                           'class' => 'form_settings',
                                           'action' =>
@@ -82,7 +82,7 @@ class DesignsettingsAction extends AccountSettingsAction
         $this->element('legend', null, _('Change background image'));
         $this->elementStart('ul', 'form_data');
         $this->elementStart('li');
-        $this->element('label', array('for' => 'design_ background-image_file'), 
+        $this->element('label', array('for' => 'design_background-image_file'), 
                                 _('Upload file'));
         $this->element('input', array('name' => 'design_background-image_file',
                                       'type' => 'file',
diff --git a/actions/shownotice.php b/actions/shownotice.php
index 2c469c9de..34c8a8e94 100644
--- a/actions/shownotice.php
+++ b/actions/shownotice.php
@@ -208,10 +208,10 @@ class ShownoticeAction extends Action
 
     function showContent()
     {
-        $this->elementStart('ul', array('class' => 'notices'));
+        $this->elementStart('ol', array('class' => 'notices xoxo'));
         $nli = new NoticeListItem($this->notice, $this);
         $nli->show();
-        $this->elementEnd('ul');
+        $this->elementEnd('ol');
     }
 
     /**