aboutsummaryrefslogtreecommitdiffstats
path: root/view/tpl
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2015-03-01 15:22:23 +0100
committerMario Vavti <mario@mariovavti.com>2015-03-01 15:22:23 +0100
commit6e64f9af54c6af4fd93afb4d7d7a1594bfb55913 (patch)
treebacb9aae2f1e17445768c3c86cdda871f2ba9657 /view/tpl
parent7018aefd6f270e21c5270738fb99a8c2da866495 (diff)
downloadvolse-hubzilla-6e64f9af54c6af4fd93afb4d7d7a1594bfb55913.tar.gz
volse-hubzilla-6e64f9af54c6af4fd93afb4d7d7a1594bfb55913.tar.bz2
volse-hubzilla-6e64f9af54c6af4fd93afb4d7d7a1594bfb55913.zip
first pile of work on settings
Diffstat (limited to 'view/tpl')
-rwxr-xr-xview/tpl/field_checkbox.tpl8
-rw-r--r--view/tpl/field_colorinput.tpl8
-rwxr-xr-xview/tpl/field_custom.tpl6
-rwxr-xr-xview/tpl/field_input.tpl10
-rwxr-xr-xview/tpl/field_intcheckbox.tpl8
-rwxr-xr-xview/tpl/field_password.tpl8
-rwxr-xr-xview/tpl/field_select.tpl8
-rw-r--r--view/tpl/field_select_disabled.tpl8
-rw-r--r--view/tpl/field_select_grouped.tpl6
-rwxr-xr-xview/tpl/field_select_raw.tpl8
-rwxr-xr-xview/tpl/field_textarea.tpl8
-rwxr-xr-xview/tpl/field_themeselect.tpl6
-rwxr-xr-xview/tpl/group_selection.tpl4
-rwxr-xr-xview/tpl/settings.tpl10
-rwxr-xr-xview/tpl/settings_nick_set.tpl2
15 files changed, 59 insertions, 49 deletions
diff --git a/view/tpl/field_checkbox.tpl b/view/tpl/field_checkbox.tpl
index 7a2781be0..b6edd8288 100755
--- a/view/tpl/field_checkbox.tpl
+++ b/view/tpl/field_checkbox.tpl
@@ -1,4 +1,6 @@
- <div class='field checkbox'>
- <label class="mainlabel" for='id_{{$field.0}}'>{{$field.1}}</label>
- <div><input type="checkbox" name='{{$field.0}}' id='id_{{$field.0}}' value="1" {{if $field.2}}checked="checked"{{/if}}><label class="switchlabel" for='id_{{$field.0}}'> <span class="onoffswitch-inner" data-on='{{if $field.4}}{{$field.4.1}}{{/if}}' data-off='{{if $field.4}}{{$field.4.0}}{{/if}}'></span><span class="onoffswitch-switch"></span> </label></div><span class='field_help'>{{$field.3}}</span>
+ <div class="form-group field checkbox">
+ <label for="id_{{$field.0}}">{{$field.1}}</label>
+ <div class="pull-right"><input type="checkbox" name='{{$field.0}}' id='id_{{$field.0}}' value="1" {{if $field.2}}checked="checked"{{/if}}><label class="switchlabel" for='id_{{$field.0}}'> <span class="onoffswitch-inner" data-on='{{if $field.4}}{{$field.4.1}}{{/if}}' data-off='{{if $field.4}}{{$field.4.0}}{{/if}}'></span><span class="onoffswitch-switch"></span></label></div>
+ <span class="help-block">{{$field.3}}</span>
</div>
+ <div class="clear"></div>
diff --git a/view/tpl/field_colorinput.tpl b/view/tpl/field_colorinput.tpl
index a1e912186..9b6f33462 100644
--- a/view/tpl/field_colorinput.tpl
+++ b/view/tpl/field_colorinput.tpl
@@ -1,6 +1,6 @@
- <div class='field input color'>
- <label class="mainlabel" for='id_{{$field.0}}' id='label_{{$field.0}}'>{{$field.1}}</label>
- <input class='color' name='{{$field.0}}' id='id_{{$field.0}}' type="text" value="{{$field.2}}">{{if $field.4}} <span class="required">{{$field.4}}</span> {{/if}}
- <span id='help_{{$field.0}}' class='field_help'>{{$field.3}}</span>
+ <div class='form-group field input color'>
+ <label for='id_{{$field.0}}' id='label_{{$field.0}}'>{{$field.1}}</label>
+ <input class='form-control color' name='{{$field.0}}' id='id_{{$field.0}}' type="text" value="{{$field.2}}">{{if $field.4}} <span class="required">{{$field.4}}</span> {{/if}}
+ <span id='help_{{$field.0}}' class='help-block'>{{$field.3}}</span>
<div id='end_{{$field.0}}' class='field_end'></div>
</div>
diff --git a/view/tpl/field_custom.tpl b/view/tpl/field_custom.tpl
index 754f5b2f4..907b4c50e 100755
--- a/view/tpl/field_custom.tpl
+++ b/view/tpl/field_custom.tpl
@@ -1,5 +1,5 @@
- <div class='field custom'>
- <label class="mainlabel" for='{{$field.0}}'>{{$field.1}}</label>
+ <div class='form-group field custom'>
+ <label for='{{$field.0}}'>{{$field.1}}</label>
{{$field.2}}
- <span class='field_help'>{{$field.3}}</span>
+ <span class='help-block'>{{$field.3}}</span>
</div>
diff --git a/view/tpl/field_input.tpl b/view/tpl/field_input.tpl
index be6e3f047..e4756c218 100755
--- a/view/tpl/field_input.tpl
+++ b/view/tpl/field_input.tpl
@@ -1,6 +1,6 @@
- <div class='field input'>
- <label class="mainlabel" for='id_{{$field.0}}' id='label_{{$field.0}}'>{{$field.1}}</label>
- <input name='{{$field.0}}' id='id_{{$field.0}}' type="text" value="{{$field.2}}">{{if $field.4}} <span class="required">{{$field.4}}</span> {{/if}}
- <span id='help_{{$field.0}}' class='field_help'>{{$field.3}}</span>
- <div id='end_{{$field.0}}' class='field_end'></div>
+ <div class='form-group field input'>
+ <label for='id_{{$field.0}}' id='label_{{$field.0}}'>{{$field.1}}</label>
+ <input class="form-control" name='{{$field.0}}' id='id_{{$field.0}}' type="text" value="{{$field.2}}">{{if $field.4}} <span class="required">{{$field.4}}</span> {{/if}}
+ <span id='help_{{$field.0}}' class='help-block'>{{$field.3}}</span>
+ <div class="clear"></div>
</div>
diff --git a/view/tpl/field_intcheckbox.tpl b/view/tpl/field_intcheckbox.tpl
index 847783518..565f97760 100755
--- a/view/tpl/field_intcheckbox.tpl
+++ b/view/tpl/field_intcheckbox.tpl
@@ -1,4 +1,6 @@
- <div class='field checkbox'>
- <label class="mainlabel" for='id_{{$field.0}}'>{{$field.1}}</label>
- <div><input type="checkbox" name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.3}}" {{if $field.2}}checked="checked"{{/if}}><label class="switchlabel" for='id_{{$field.0}}'> <span class="onoffswitch-inner" data-on='{{if $field.5}}{{$field.5.1}}{{/if}}' data-off='{{if $field.5}}{{$field.5.0}}{{/if}}'></span><span class="onoffswitch-switch"></span> </label></div><span class='field_help'>{{$field.4}}</span>
+ <div class="form-group field checkbox">
+ <label for='id_{{$field.0}}'>{{$field.1}}</label>
+ <div class="pull-right"><input type="checkbox" name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.3}}" {{if $field.2}}checked="checked"{{/if}}><label class="switchlabel" for='id_{{$field.0}}'> <span class="onoffswitch-inner" data-on='{{if $field.5}}{{$field.5.1}}{{/if}}' data-off='{{if $field.5}}{{$field.5.0}}{{/if}}'></span><span class="onoffswitch-switch"></span> </label></div>
+ <span class='help-block'>{{$field.4}}</span>
</div>
+ <div class="clear"></div>
diff --git a/view/tpl/field_password.tpl b/view/tpl/field_password.tpl
index 38ecf3d07..c9f4c5f6d 100755
--- a/view/tpl/field_password.tpl
+++ b/view/tpl/field_password.tpl
@@ -1,5 +1,5 @@
- <div class='field password'>
- <label class="mainlabel" for='id_{{$field.0}}'>{{$field.1}}</label>
- <input type='password' name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.2}}">
- <span class='field_help'>{{$field.3}}</span>
+ <div class='form-group field password'>
+ <label for='id_{{$field.0}}'>{{$field.1}}</label>
+ <input class="form-control" type='password' name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.2}}">
+ <span class='help-block'>{{$field.3}}</span>
</div>
diff --git a/view/tpl/field_select.tpl b/view/tpl/field_select.tpl
index 95d1855d6..762447290 100755
--- a/view/tpl/field_select.tpl
+++ b/view/tpl/field_select.tpl
@@ -1,7 +1,7 @@
- <div class='field select'>
- <label class="mainlabel" for='id_{{$field.0}}'>{{$field.1}}</label>
- <select name='{{$field.0}}' id='id_{{$field.0}}'>
+ <div class='form-group field select'>
+ <label for='id_{{$field.0}}'>{{$field.1}}</label>
+ <select class="form-control" name='{{$field.0}}' id='id_{{$field.0}}'>
{{foreach $field.4 as $opt=>$val}}<option value="{{$opt}}" {{if $opt==$field.2}}selected="selected"{{/if}}>{{$val}}</option>{{/foreach}}
</select>
- <span class='field_help'>{{$field.3}}</span>
+ <span class='help-block'>{{$field.3}}</span>
</div>
diff --git a/view/tpl/field_select_disabled.tpl b/view/tpl/field_select_disabled.tpl
index e241be895..ee5e1508f 100644
--- a/view/tpl/field_select_disabled.tpl
+++ b/view/tpl/field_select_disabled.tpl
@@ -1,7 +1,7 @@
- <div class='field select'>
- <label class="mainlabel" style="font-weight: normal;" for='id_{{$field.0}}'>{{$field.1}}</label>
- <select disabled="true" name='{{$field.0}}' id='id_{{$field.0}}'>
+ <div class='form-group field select'>
+ <label style="font-weight: normal;" for='id_{{$field.0}}'>{{$field.1}}</label>
+ <select class="form-control" disabled="true" name='{{$field.0}}' id='id_{{$field.0}}'>
{{foreach $field.4 as $opt=>$val}}<option value="{{$opt}}" {{if $opt==$field.2}}selected="selected"{{/if}}>{{$val}}</option>{{/foreach}}
</select>
- <span class='field_help'>{{$field.3}}</span>
+ <span class='help-block'>{{$field.3}}</span>
</div>
diff --git a/view/tpl/field_select_grouped.tpl b/view/tpl/field_select_grouped.tpl
index c7fb4f322..e6d1479de 100644
--- a/view/tpl/field_select_grouped.tpl
+++ b/view/tpl/field_select_grouped.tpl
@@ -1,6 +1,6 @@
- <div class='field select'>
+ <div class='form-group field select'>
<label for='id_{{$field.0}}'>{{$field.1}}</label>
- <select name='{{$field.0}}' id='id_{{$field.0}}'>
+ <select class="form-control" name='{{$field.0}}' id='id_{{$field.0}}'>
{{foreach $field.4 as $group=>$opts}}
<optgroup label='{{$group}}'>
{{foreach $opts as $opt=>$val}}
@@ -8,5 +8,5 @@
{{/foreach}}
</optgroup>
</select>
- <span class='field_help'>{{$field.3}}</span>
+ <span class='help-block'>{{$field.3}}</span>
</div>
diff --git a/view/tpl/field_select_raw.tpl b/view/tpl/field_select_raw.tpl
index 74d575bd0..2780df58c 100755
--- a/view/tpl/field_select_raw.tpl
+++ b/view/tpl/field_select_raw.tpl
@@ -1,7 +1,7 @@
- <div class='field select'>
- <label class="mainlabel" for='id_{{$field.0}}'>{{$field.1}}</label>
- <select name='{{$field.0}}' id='id_{{$field.0}}'>
+ <div class='form-group field select'>
+ <label for='id_{{$field.0}}'>{{$field.1}}</label>
+ <select class="form-control" name='{{$field.0}}' id='id_{{$field.0}}'>
{{$field.4}}
</select>
- <span class='field_help'>{{$field.3}}</span>
+ <span class='help-block'>{{$field.3}}</span>
</div>
diff --git a/view/tpl/field_textarea.tpl b/view/tpl/field_textarea.tpl
index dad89a145..01fdc23f5 100755
--- a/view/tpl/field_textarea.tpl
+++ b/view/tpl/field_textarea.tpl
@@ -1,5 +1,5 @@
- <div class='field textarea'>
- <label class="mainlabel" for='id_{{$field.0}}'>{{$field.1}}</label>
- <textarea name='{{$field.0}}' id='id_{{$field.0}}' {{if $field.4}}{{$field.4}}{{/if}} >{{$field.2}}</textarea>
- <span class='field_help'>{{$field.3}}</span>
+ <div class='form-group field textarea'>
+ <label for='id_{{$field.0}}'>{{$field.1}}</label>
+ <textarea class="form-control" name='{{$field.0}}' id='id_{{$field.0}}' {{if $field.4}}{{$field.4}}{{/if}} >{{$field.2}}</textarea>
+ <span class='help-block'>{{$field.3}}</span>
</div>
diff --git a/view/tpl/field_themeselect.tpl b/view/tpl/field_themeselect.tpl
index 120727478..200cf726b 100755
--- a/view/tpl/field_themeselect.tpl
+++ b/view/tpl/field_themeselect.tpl
@@ -1,7 +1,7 @@
<script>$(document).ready(function(){ previewTheme($("#id_{{$field.0}}")[0]); });</script>
- <div class='field select'>
- <label class="mainlabel" for='id_{{$field.0}}'>{{$field.1}}</label>
- <select name='{{$field.0}}' id='id_{{$field.0}}' {{if $field.5=='preview'}}onchange="previewTheme(this);"{{/if}} >
+ <div class='form-group field select'>
+ <label for='id_{{$field.0}}'>{{$field.1}}</label>
+ <select class="form-control" name='{{$field.0}}' id='id_{{$field.0}}' {{if $field.5=='preview'}}onchange="previewTheme(this);"{{/if}} >
{{foreach $field.4 as $opt=>$val}}<option value="{{$opt}}" {{if $opt==$field.2}}selected="selected"{{/if}}>{{$val}}</option>{{/foreach}}
</select>
<span class='field_help'>{{$field.3}}</span>
diff --git a/view/tpl/group_selection.tpl b/view/tpl/group_selection.tpl
index 2223125ea..270d2aa79 100755
--- a/view/tpl/group_selection.tpl
+++ b/view/tpl/group_selection.tpl
@@ -1,6 +1,6 @@
-<div class="field custom">
+<div class="form-group field custom">
<label for="group-selection" id="group-selection-lbl">{{$label}}</label>
-<select name="group-selection" id="group-selection" >
+<select class="form-control" name="group-selection" id="group-selection" >
{{foreach $groups as $group}}
<option value="{{$group.id}}" {{if $group.selected}}selected="selected"{{/if}} >{{$group.name}}</option>
{{/foreach}}
diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl
index 894f0fe83..b41bf87b9 100755
--- a/view/tpl/settings.tpl
+++ b/view/tpl/settings.tpl
@@ -1,5 +1,8 @@
-<div class="generic-content-wrapper-styled">
-<h1>{{$ptitle}}</h1>
+<div class="generic-content-wrapper">
+<div class="section-title-wrapper">
+<h2>{{$ptitle}}</h2>
+</div>
+<div class="section-content-wrapper">
{{$nickname_block}}
@@ -78,10 +81,12 @@
<div id="settings-notifications">
<div id="settings-activity-desc">{{$activity_options}}</div>
+<div class="group">
{{*not yet implemented *}}
{{*include file="field_checkbox.tpl" field=$post_joingroup*}}
{{include file="field_checkbox.tpl" field=$post_newfriend}}
{{include file="field_checkbox.tpl" field=$post_profilechange}}
+</div>
<div id="settings-notify-desc">{{$lbl_not}}</div>
@@ -150,3 +155,4 @@
</div>
</div>
+</div>
diff --git a/view/tpl/settings_nick_set.tpl b/view/tpl/settings_nick_set.tpl
index ae11c00c8..5d9f17e9e 100755
--- a/view/tpl/settings_nick_set.tpl
+++ b/view/tpl/settings_nick_set.tpl
@@ -1,4 +1,4 @@
<div id="settings-nick-wrapper" >
-<div id="settings-nickname-desc" class="info-message">{{$desc}} <strong>'{{$nickname}}@{{$basepath}}'</strong>{{$subdir}}</div>
+<div id="settings-nickname-desc" class="alert alert-info" role="alert">{{$desc}} <strong>'{{$nickname}}@{{$basepath}}'</strong>{{$subdir}}</div>
</div>
<div id="settings-nick-end" ></div>
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-19 23:03:17 +0000