Commit 007d1be0 authored by Zach Copley's avatar Zach Copley

Give bookmark form elements unique ids

parent 5206ee7f
......@@ -116,10 +116,11 @@ class BookmarkForm extends Form
$this->out->elementStart('ul', 'form_data');
$this->li();
$this->out->input('url',
$this->out->input('bookmark-url',
// TRANS: Field label on form for adding a new bookmark.
_m('LABEL','URL'),
$this->_url);
$this->_url,
'url');
$this->unli();
list($width, $height) = $this->scaleImage($this->_thumbnail->width,
......@@ -133,26 +134,29 @@ class BookmarkForm extends Form
}
$this->li();
$this->out->input('title',
$this->out->input('bookmark-title',
// TRANS: Field label on form for adding a new bookmark.
_m('LABEL','Title'),
$this->_title);
$this->_title,
'title');
$this->unli();
$this->li();
$this->out->textarea('description',
$this->out->textarea('bookmark-description',
// TRANS: Field label on form for adding a new bookmark.
_m('LABEL','Notes'),
$this->_description);
$this->_description,
'description');
$this->unli();
$this->li();
$this->out->input('tags',
$this->out->input('bookmark-tags',
// TRANS: Field label on form for adding a new bookmark.
_m('LABEL','Tags'),
$this->_tags,
// 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->out->elementEnd('ul');
......
......@@ -68,7 +68,7 @@ class BookmarkforurlAction extends Action
$this->checkSessionToken();
$this->url = $this->trimmed('url');
$this->url = $this->trimmed('initial-bookmark-url');
if (empty($this->url)) {
throw new ClientException(_('URL is required.'), 400);
......
......@@ -73,10 +73,9 @@ class InitialBookmarkForm extends Form
$this->out->elementStart('ul', 'form_data');
$this->li();
$this->out->input('url',
$this->out->input('initial-bookmark-url',
// TRANS: Field label on form for adding a new bookmark.
_m('LABEL','URL'),
null);
_m('LABEL','URL'));
$this->unli();
$this->out->elementEnd('ul');
......
......@@ -87,10 +87,10 @@ class NewbookmarkAction extends Action
$this->checkSessionToken();
}
$this->title = $this->trimmed('title');
$this->url = $this->trimmed('url');
$this->tags = $this->trimmed('tags');
$this->description = $this->trimmed('description');
$this->title = $this->trimmed('bookmark-title');
$this->url = $this->trimmed('bookmark-url');
$this->tags = $this->trimmed('bookmark-tags');
$this->description = $this->trimmed('bookmark-description');
return true;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment