eliseuamaro
/
gnu-social
forked from GNUsocial/gnu-social
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Give bookmark form elements unique ids

This commit is contained in:
Zach Copley 2011-04-17 15:09:56 -07:00
parent 5206ee7f9a
commit 007d1be06d
4 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
plugins/Bookmark/bookmarkform.php
View File

@ -116,10 +116,11 @@ class BookmarkForm extends Form
$this->out->elementStart('ul', 'form_data'); $this->out->elementStart('ul', 'form_data');
$this->li(); $this->li();
$this->out->input('url', $this->out->input('bookmark-url',
// TRANS: Field label on form for adding a new bookmark. // TRANS: Field label on form for adding a new bookmark.
_m('LABEL','URL'), _m('LABEL','URL'),
$this->_url); $this->_url,
'url');
$this->unli(); $this->unli();
list($width, $height) = $this->scaleImage($this->_thumbnail->width, list($width, $height) = $this->scaleImage($this->_thumbnail->width,
@ -133,26 +134,29 @@ class BookmarkForm extends Form
} }
$this->li(); $this->li();
$this->out->input('title', $this->out->input('bookmark-title',
// TRANS: Field label on form for adding a new bookmark. // TRANS: Field label on form for adding a new bookmark.
_m('LABEL','Title'), _m('LABEL','Title'),
$this->_title); $this->_title,
'title');
$this->unli(); $this->unli();
$this->li(); $this->li();
$this->out->textarea('description', $this->out->textarea('bookmark-description',
// TRANS: Field label on form for adding a new bookmark. // TRANS: Field label on form for adding a new bookmark.
_m('LABEL','Notes'), _m('LABEL','Notes'),
$this->_description); $this->_description,
'description');
$this->unli(); $this->unli();
$this->li(); $this->li();
$this->out->input('tags', $this->out->input('bookmark-tags',
// TRANS: Field label on form for adding a new bookmark. // TRANS: Field label on form for adding a new bookmark.
_m('LABEL','Tags'), _m('LABEL','Tags'),
$this->_tags, $this->_tags,
// TRANS: Field title on form for adding a new bookmark. // TRANS: Field title on form for adding a new bookmark.
_m('Comma- or space-separated list of tags.')); _m('Comma- or space-separated list of tags.'),
'tags');
$this->unli(); $this->unli();
$this->out->elementEnd('ul'); $this->out->elementEnd('ul');

2
plugins/Bookmark/bookmarkforurl.php
View File

@ -68,7 +68,7 @@ class BookmarkforurlAction extends Action
$this->checkSessionToken(); $this->checkSessionToken();
$this->url = $this->trimmed('url'); $this->url = $this->trimmed('initial-bookmark-url');
if (empty($this->url)) { if (empty($this->url)) {
throw new ClientException(_('URL is required.'), 400); throw new ClientException(_('URL is required.'), 400);

5
plugins/Bookmark/initialbookmarkform.php
View File

@ -73,10 +73,9 @@ class InitialBookmarkForm extends Form
$this->out->elementStart('ul', 'form_data'); $this->out->elementStart('ul', 'form_data');
$this->li(); $this->li();
$this->out->input('url', $this->out->input('initial-bookmark-url',
// TRANS: Field label on form for adding a new bookmark. // TRANS: Field label on form for adding a new bookmark.
_m('LABEL','URL'), _m('LABEL','URL'));
null);
$this->unli(); $this->unli();
$this->out->elementEnd('ul'); $this->out->elementEnd('ul');

8
plugins/Bookmark/newbookmark.php
View File

@ -87,10 +87,10 @@ class NewbookmarkAction extends Action
$this->checkSessionToken(); $this->checkSessionToken();
} }
$this->title = $this->trimmed('title'); $this->title = $this->trimmed('bookmark-title');
$this->url = $this->trimmed('url'); $this->url = $this->trimmed('bookmark-url');
$this->tags = $this->trimmed('tags'); $this->tags = $this->trimmed('bookmark-tags');
$this->description = $this->trimmed('description'); $this->description = $this->trimmed('bookmark-description');
return true; return true;
} }