diff options
author | zottel <github@zottel.net> | 2012-03-19 09:34:39 +0100 |
---|---|---|
committer | zottel <github@zottel.net> | 2012-03-19 09:34:39 +0100 |
commit | 6d31e3d6ef56e22ecedccaeb6846b52da501097b (patch) | |
tree | 86518b59c0318d8057a1a8503c6354ebaa96dae3 /view | |
parent | df78c9be0bab909dfa8cf196f7aaa4ea3423be8c (diff) | |
parent | 283bc51acf479eebd54145eb639c681980f6717b (diff) | |
download | volse-hubzilla-6d31e3d6ef56e22ecedccaeb6846b52da501097b.tar.gz volse-hubzilla-6d31e3d6ef56e22ecedccaeb6846b52da501097b.tar.bz2 volse-hubzilla-6d31e3d6ef56e22ecedccaeb6846b52da501097b.zip |
Merge remote branch 'upstream/master'
Diffstat (limited to 'view')
-rwxr-xr-x | view/atom_feed.tpl | 1 | ||||
-rwxr-xr-x | view/atom_feed_dfrn.tpl | 3 | ||||
-rwxr-xr-x | view/group_drop.tpl | 2 | ||||
-rwxr-xr-x | view/group_edit.tpl | 1 | ||||
-rw-r--r-- | view/theme/dispy-dark/style.css | 2 | ||||
-rw-r--r-- | view/theme/dispy/style.css | 2 |
6 files changed, 7 insertions, 4 deletions
diff --git a/view/atom_feed.tpl b/view/atom_feed.tpl index 72cf8e4fd..2feb547ee 100755 --- a/view/atom_feed.tpl +++ b/view/atom_feed.tpl @@ -16,6 +16,7 @@ <link rel="license" href="http://creativecommons.org/licenses/by/3.0/" /> $hub $salmon + $community <updated>$feed_updated</updated> diff --git a/view/atom_feed_dfrn.tpl b/view/atom_feed_dfrn.tpl index 3d6bcc5b5..0bae62b52 100755 --- a/view/atom_feed_dfrn.tpl +++ b/view/atom_feed_dfrn.tpl @@ -12,10 +12,11 @@ <id>$feed_id</id> <title>$feed_title</title> - <generator uri="http://friendika.com" version="$version">Friendika</generator> + <generator uri="http://friendica.com" version="$version">Friendica</generator> <link rel="license" href="http://creativecommons.org/licenses/by/3.0/" /> $hub $salmon + $community <updated>$feed_updated</updated> diff --git a/view/group_drop.tpl b/view/group_drop.tpl index cbae1610f..2cbebbb8e 100755 --- a/view/group_drop.tpl +++ b/view/group_drop.tpl @@ -1,5 +1,5 @@ <div class="group-delete-wrapper button" id="group-delete-wrapper-$id" > - <a href="group/drop/$id" + <a href="group/drop/$id?t=$form_security_token" onclick="return confirmDelete();" id="group-delete-icon-$id" class="icon drophide group-delete-icon" diff --git a/view/group_edit.tpl b/view/group_edit.tpl index 3689db753..2fa2b1a55 100755 --- a/view/group_edit.tpl +++ b/view/group_edit.tpl @@ -3,6 +3,7 @@ <div id="group-edit-wrapper" > <form action="group/$gid" id="group-edit-form" method="post" > + <input type='hidden' name='form_security_token' value='$form_security_token'> {{ inc field_input.tpl with $field=$gname }}{{ endinc }} {{ if $drop }}$drop{{ endif }} diff --git a/view/theme/dispy-dark/style.css b/view/theme/dispy-dark/style.css index b4aefbbf2..eaaa0acbd 100644 --- a/view/theme/dispy-dark/style.css +++ b/view/theme/dispy-dark/style.css @@ -1258,7 +1258,7 @@ section { } [class^="comment-edit-text"] { margin: 5px 0 10px 20px; - width: 86.5%; + width: 84.5%; } .comment-edit-text-empty { height: 20px; diff --git a/view/theme/dispy/style.css b/view/theme/dispy/style.css index 26ac08c8c..812c5ee2e 100644 --- a/view/theme/dispy/style.css +++ b/view/theme/dispy/style.css @@ -1256,7 +1256,7 @@ section { } [class^="comment-edit-text"] { margin: 5px 0 10px 20px; - width: 86.5%; + width: 84.5%; } .comment-edit-text-empty { height: 20px; |