diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-03-02 04:07:23 -0500 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-03-02 04:07:23 -0500 |
| commit | f0fdd1a163b6bc7213eeb48c6ee9025087bb0032 (patch) | |
| tree | 2e7855a389313397b310a70b0e6072a5ba6dcce1 /view/group_edit.tpl | |
| parent | b7ab2a2fc92bbd7ec3a506e18f950579e10719eb (diff) | |
| parent | 90bdddca0d1b2e2128646d1f698b6d514e748001 (diff) | |
| download | volse-hubzilla-f0fdd1a163b6bc7213eeb48c6ee9025087bb0032.tar.gz volse-hubzilla-f0fdd1a163b6bc7213eeb48c6ee9025087bb0032.tar.bz2 volse-hubzilla-f0fdd1a163b6bc7213eeb48c6ee9025087bb0032.zip | |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
item table update for file feature
probe for very old (0.97 or 1.0) RSS feed with an incorrect or generic content-type
diabook commit
conversation: remove templating items in code and move it to template.
Enabled automated doc building. Changes: -build.xml, phing build file -@package tags at acl_selector.php and db_update.php -added documentation and some IDE files to .gitignore -automated tool to find files that corrupt the doc build process -removed ansi characters from SSH1.php, docBlox could not handle them
template proc: avoid a notice and allow template name to include to be passed with a variable value
show relation in contact_template
admin: fix small string
fix visualization in groupeditor
less html in mod/group.php, template for group members editor, quattro theme for group edit.
* master:
Diffstat (limited to 'view/group_edit.tpl')
| -rwxr-xr-x | view/group_edit.tpl | 30 |
1 files changed, 17 insertions, 13 deletions
diff --git a/view/group_edit.tpl b/view/group_edit.tpl index 51782ab95..3689db753 100755 --- a/view/group_edit.tpl +++ b/view/group_edit.tpl @@ -2,17 +2,21 @@ <div id="group-edit-wrapper" > -<form action="group/$gid" id="group-edit-form" method="post" > -<div id="group-edit-name-wrapper" > -<label id="group-edit-name-label" for="group-edit-name" >$gname</label> -<input type="text" id="group-edit-name" name="groupname" value="$name" /> -</div> -<div id="group-edit-name-end"></div> -$drop -<div id="group-edit-submit-wrapper" > -<input type="submit" name="submit" value="$submit" > -</div> -<div id="group-edit-desc">$desc</div> -<div id="group-edit-select-end" ></div> -</form> + <form action="group/$gid" id="group-edit-form" method="post" > + + {{ inc field_input.tpl with $field=$gname }}{{ endinc }} + {{ if $drop }}$drop{{ endif }} + <div id="group-edit-submit-wrapper" > + <input type="submit" name="submit" value="$submit" > + </div> + <div id="group-edit-select-end" ></div> + </form> </div> + + +{{ if $groupeditor }} + <div id="group-update-wrapper"> + {{ inc groupeditor.tpl }}{{ endinc }} + </div> +{{ endif }} +{{ if $desc }}<div id="group-edit-desc">$desc</div>{{ endif }} |