aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
authorChristian Vogeley <christian.vogeley@hotmail.de>2013-09-08 18:03:26 +0200
committerChristian Vogeley <christian.vogeley@hotmail.de>2013-09-08 18:03:26 +0200
commite70c9b3613088f2a34f83cb2e78a1eaee152f8cb (patch)
tree7b51c5e13cfd614ac475ec403860efa0945eb9a2 /view
parentb88f60b51ff9416c35b5af9ce849026666c47cc8 (diff)
parentf4dfb90dbc9b7590d9b8bf84df9ca746f1aa1d6f (diff)
downloadvolse-hubzilla-e70c9b3613088f2a34f83cb2e78a1eaee152f8cb.tar.gz
volse-hubzilla-e70c9b3613088f2a34f83cb2e78a1eaee152f8cb.tar.bz2
volse-hubzilla-e70c9b3613088f2a34f83cb2e78a1eaee152f8cb.zip
Merge service class
//service class configure in .htconfig.php: $a->config['system']['default_service_class']='standard'; // this is the default service class that is attached to every new account $a->config['service_class']['standard'] = array('photo_upload_limit'=>20000000, // total photo storage limit per channel (here 20MB) 'total_identities' =>5, // number of channels an account can create 'total_items' =>2000, // number of top level posts a channel can create. Applies only to top level posts of the user, other posts and comments are unaffected 'total_pages' =>10, // number of pages a channel can create 'total_channels' =>500, // number of channels the user can add, other users can still add this channel, even if the limit is reached 'attach_upload_limit' =>20000000); // total attachment storage limit per channel (here 20MB)
Diffstat (limited to 'view')
-rwxr-xr-xview/tpl/channels.tpl5
-rwxr-xr-xview/tpl/follow.tpl3
-rwxr-xr-xview/tpl/photos_upload.tpl2
3 files changed, 9 insertions, 1 deletions
diff --git a/view/tpl/channels.tpl b/view/tpl/channels.tpl
index 317384661..af6b36b1d 100755
--- a/view/tpl/channels.tpl
+++ b/view/tpl/channels.tpl
@@ -7,6 +7,11 @@
{{/foreach}}
{{/if}}
+{{if $channel_usage_message}}
+<div id="channel-usage-message" class="usage-message">
+{{$channel_usage_message}}
+</div>
+{{/if}}
{{if $selected}}
<div id="selected-channel">
<div id="channels-selected">{{$msg_selected}}</div>
diff --git a/view/tpl/follow.tpl b/view/tpl/follow.tpl
index 350f8d910..b0597e9b6 100755
--- a/view/tpl/follow.tpl
+++ b/view/tpl/follow.tpl
@@ -4,5 +4,8 @@
<form action="follow" method="post" />
<input id="side-follow-url" type="text" name="url" size="24" title="{{$hint}}" /><input id="side-follow-submit" type="submit" name="submit" value="{{$follow}}" />
</form>
+ {{if $abook_usage_message}}
+ <div class="usage-message" id="abook-usage-message">{{$abook_usage_message}}</div>
+ {{/if}}
</div>
diff --git a/view/tpl/photos_upload.tpl b/view/tpl/photos_upload.tpl
index 707024cb9..102c4d872 100755
--- a/view/tpl/photos_upload.tpl
+++ b/view/tpl/photos_upload.tpl
@@ -1,6 +1,6 @@
<h3>{{$pagename}}</h3>
-<div id="photos-usage-message">{{$usage}}</div>
+<div id="photos-usage-message" class="usage-message">{{$usage}}</div>
<form action="photos/{{$nickname}}" enctype="multipart/form-data" method="post" name="photos-upload-form" id="photos-upload-form" >
<input type="hidden" id="photos-upload-source" name="source" value="photos" />