diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-05-18 12:12:40 -0400 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-05-18 12:12:40 -0400 |
| commit | 83f0807e59b5be288374a825d1e4f75869d515de (patch) | |
| tree | 8f3226d74c76d736564e0c6ed9e97f6d0388126c /view | |
| parent | c024c17b5f7253432e9c53aa642f003b537f6b6b (diff) | |
| parent | 38217444502aee41d71d90c0c8927999bb1b12e6 (diff) | |
| download | volse-hubzilla-83f0807e59b5be288374a825d1e4f75869d515de.tar.gz volse-hubzilla-83f0807e59b5be288374a825d1e4f75869d515de.tar.bz2 volse-hubzilla-83f0807e59b5be288374a825d1e4f75869d515de.zip | |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
apply max-width to images in posts, duepuntozero
theming for default group selector
catch more places to apply default group
make it difficult to setup a private forum with no privacy
more private forums, default privacy group for new contacts
tell browser not to cache permission denied (private) photos so that after authenticating we don't have to fight the browser - plus more prvgroup work
* master:
Diffstat (limited to 'view')
| -rw-r--r-- | view/group_selection.tpl | 8 | ||||
| -rw-r--r-- | view/pagetypes.tpl | 3 | ||||
| -rw-r--r-- | view/settings.tpl | 5 | ||||
| -rw-r--r-- | view/theme/duepuntozero/style.css | 5 |
4 files changed, 21 insertions, 0 deletions
diff --git a/view/group_selection.tpl b/view/group_selection.tpl new file mode 100644 index 000000000..3809cb994 --- /dev/null +++ b/view/group_selection.tpl @@ -0,0 +1,8 @@ +<div class="field custom"> +<label for="group-selection" id="group-selection-lbl">$label</label> +<select name="group-selection" id="group-selection" > +{{ for $groups as $group }} +<option value="$group.id" {{ if $group.selected }}selected="selected"{{ endif }} >$group.name</option> +{{ endfor }} +</select> +</div> diff --git a/view/pagetypes.tpl b/view/pagetypes.tpl index d9f873ea0..924fc47ac 100644 --- a/view/pagetypes.tpl +++ b/view/pagetypes.tpl @@ -2,3 +2,6 @@ {{inc field_radio.tpl with $field=$page_soapbox }}{{endinc}} {{inc field_radio.tpl with $field=$page_community }}{{endinc}} {{inc field_radio.tpl with $field=$page_freelove }}{{endinc}} + {{ if $experimental }} + {{inc field_radio.tpl with $field=$page_prvgroup }}{{endinc}} + {{ endif }}
\ No newline at end of file diff --git a/view/settings.tpl b/view/settings.tpl index cec3c6f64..556cd3ba3 100644 --- a/view/settings.tpl +++ b/view/settings.tpl @@ -56,9 +56,12 @@ $suggestme $unkmail + {{inc field_input.tpl with $field=$cntunkmail }}{{endinc}} {{inc field_input.tpl with $field=$expire.days }}{{endinc}} + + <div class="field input"> <span class="field_help"><a href="#advanced-expire-popup" id="advanced-expire" class='popupbox' title="$expire.advanced">$expire.label</a></span> <div style="display: none;"> @@ -90,6 +93,8 @@ $unkmail <br/> <div id="settings-default-perms-end"></div> +$group_select + <div class="settings-submit-wrapper" > <input type="submit" name="submit" class="settings-submit" value="Submit" /> diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css index b978c13e5..826acc7ef 100644 --- a/view/theme/duepuntozero/style.css +++ b/view/theme/duepuntozero/style.css @@ -1091,6 +1091,11 @@ input#dfrn-url { overflow: auto; } +.wall-item-content img { + max-width: 700px; +} + + .wall-item-title { float: left; font-weight: bold; |