From c165f0825acb52c6ee68ff7628d8c0af259d9e6a Mon Sep 17 00:00:00 2001
From: Go Frendi Gunawan <goFrendiAsgard@gmail.com>
Date: Mon, 24 Oct 2016 08:20:09 +0700
Subject: [PATCH] fix up things

---
 application/helpers/cms_helper.php         |  47 ++++++
 modules/installer/models/Install_model.php |   2 +-
 modules/main/views/main_change_profile.php | 173 ++++++++-------------
 modules/main/views/main_register.php       |  59 ++-----
 modules/multisite/views/register.php       | 150 +++++-------------
 readme.md                                  |   2 +-
 6 files changed, 166 insertions(+), 267 deletions(-)

diff --git a/application/helpers/cms_helper.php b/application/helpers/cms_helper.php
index 7fea7f09..6202de7b 100755
--- a/application/helpers/cms_helper.php
+++ b/application/helpers/cms_helper.php
@@ -605,3 +605,50 @@ function parse_record($record, $config=array()){
     $replace[] = $backend_urls;
     return str_replace($search, $replace, $record_template);
 }
+
+function create_labeled_form_input($id, $label, $input_html){
+    $input_html = str_replace('{{ id }}', $id, $input_html);
+    $html = '';
+    $html .= '<div class="form-group col-sm-12">';
+    $html .= form_label($label, $id, array('class' => 'control-label col-sm-4'));
+    $html .= '<div class="col-sm-8">';
+    $html .= $input_html;
+    $html .= '</div>';
+    $html .= '</div>';
+    return $html;
+}
+
+function build_register_input($secret_code, $user_name, $email, $real_name){
+    $html = '';
+
+    $id = $secret_code.'user_name';
+    $input_html = form_input($id, $user_name,
+        'id="{{ id }}" placeholder="User Name" class="form-control"');
+    $html .= create_labeled_form_input($id, '{{ language:User Name }}', $input_html);
+
+    $id = $secret_code.'real_name';
+    $input_html = form_input($id, $real_name,
+        'id="{{ id }}" placeholder="Real Name" class="form-control"');
+    $html .= create_labeled_form_input($id, '{{ language:Real Name }}', $input_html);
+
+    $id = $secret_code.'email';
+    $input_html = form_input($id, $email,
+        'id="{{ id }}" placeholder="Email" class="form-control"');
+    $html .= create_labeled_form_input($id, '{{ language:Email }}', $input_html);
+
+
+    $id = $secret_code.'password';
+    $input_html = form_password($id, '',
+        'id="{{ id }}" placeholder="Password" class="form-control"');
+    $html .= create_labeled_form_input($id, '{{ language:Password }}', $input_html);
+
+    // spacer
+    $html .= '<div class="form-group col-md-6">&nbsp;</div>';
+
+    $id = $secret_code.'confirm_password';
+    $input_html = form_password($id, '',
+        'id="{{ id }}" placeholder="Password (again)" class="form-control"');
+    $html .= create_labeled_form_input($id, '{{ language:Confirm Password }}', $input_html);
+
+    return $html;
+}
diff --git a/modules/installer/models/Install_model.php b/modules/installer/models/Install_model.php
index a72ecdb2..d462dc99 100755
--- a/modules/installer/models/Install_model.php
+++ b/modules/installer/models/Install_model.php
@@ -1043,7 +1043,7 @@ protected function insert_all_data($config=NULL){
                 array('main_register', NULL, 'Register', 'Register', NULL, 'New User Registration', 'main/register',
                     2, 7, 1, 0, NULL, 0, NULL, NULL, 'default-one-column'),
                 array('main_change_profile', NULL, 'Change Profile', 'Change Profile', NULL, 'Change Current Profile', 'main/change_profile',
-                    3, 8, 1, 0, NULL, 0),
+                    3, 8, 1, 0, NULL, 0, NULL, NULL, 'default-one-column'),
                 array('main_group_management', 4, 'Group Management', 'Group Management', NULL, 'Group Management', 'main/manage_group',
                     4, 0, 1, 0, NULL, 0, NULL, NULL, 'default-one-column'),
                 array('main_user_management', 4, 'User Management', 'User Management', NULL, 'Manage User', 'main/manage_user',
diff --git a/modules/main/views/main_change_profile.php b/modules/main/views/main_change_profile.php
index c58a9d41..591f47e4 100755
--- a/modules/main/views/main_change_profile.php
+++ b/modules/main/views/main_change_profile.php
@@ -6,9 +6,9 @@
 echo $asset->compile_css();
 ?>
 <style type="text/css">
-	#message:empty{
-		display:none;
-	}
+    #message:empty{
+        display:none;
+    }
 </style>
 
 <?php
@@ -19,8 +19,8 @@
 ?>
 
 <script type="text/javascript">
-	var REQUEST_EXISTS = false;
-	var REQUEST = "";
+    var REQUEST_EXISTS = false;
+    var REQUEST = "";
     function check_change_profile(){
         var email =  $('input[name="email"]').val();
         var password = $('input[name="password"]').val();
@@ -28,7 +28,7 @@ function check_change_profile(){
         var change_password_checked = $('input[name="change_password"]:checked').length > 0;
         $("#img_ajax_loader").show();
         if(REQUEST_EXISTS){
-        	REQUEST.abort();
+            REQUEST.abort();
         }
         REQUEST_EXISTS = true;
         // build request data
@@ -59,12 +59,12 @@ function check_change_profile(){
                     message += data.message+'<br />';
                 }
                 if(change_password_checked){
-	                if(password == '' && change_password_checked){
-	                    message += '{{ language:Password is empty }}<br />';
-	                }
-	                if(password != confirm_password){
-	                    message += '{{ language:Confirm password doesn\'t match }}';
-	                }
+                    if(password == '' && change_password_checked){
+                        message += '{{ language:Password is empty }}<br />';
+                    }
+                    if(password != confirm_password){
+                        message += '{{ language:Confirm password doesn\'t match }}';
+                    }
                 }
 
                 if(message != $('#message').html()){
@@ -96,152 +96,107 @@ function toggle_password_input(){
             check_change_profile();
         });
         $('input, select, textarea').change(function(){
-        	check_change_profile();
+            check_change_profile();
         });
         $('input[name="change_password"]').change(function(){toggle_password_input();});
         // turn select into chosen
         $('.chosen-select').chosen({allow_single_deselect:true, width:"100%", search_contains: true});
         // turn input into datepicker
-    	$('.datepicker-input').datepicker({
-    			dateFormat: 'yy-mm-dd',
-    			showButtonPanel: true,
-    			changeMonth: true,
-    			changeYear: true,
-				yearRange: "-150:+0"
-    	});
-
-    	$('.datepicker-input-clear').button();
-
-    	$('.datepicker-input-clear').click(function(){
-    		$(this).parent().find('.datepicker-input').val("");
-    		return false;
-    	});
+        $('.datepicker-input').datepicker({
+                dateFormat: 'yy-mm-dd',
+                showButtonPanel: true,
+                changeMonth: true,
+                changeYear: true,
+                yearRange: "-150:+0"
+        });
+
+        $('.datepicker-input-clear').button();
+
+        $('.datepicker-input-clear').click(function(){
+            $(this).parent().find('.datepicker-input').val("");
+            return false;
+        });
     })
 </script>
 <h3>{{ language:Change Profile }}</h3>
 <?php
     echo form_open_multipart('main/change_profile', 'class="ajax-check-form form form-horizontal"');
 
-    echo '<div class="form-group">';
-    echo form_label('{{ language:Profile Picture }}', ' for="" class="control-label col-sm-4');
-    echo '<div class="col-sm-8">';
+    $input = '';
     if(trim($profile_picture) != ''){
-        echo '<img style="max-width:256px;" src="{{ BASE_URL }}assets/nocms/images/profile_picture/' . $profile_picture . '" />';
+        $input .= '<img style="max-width:256px;" src="{{ BASE_URL }}assets/nocms/images/profile_picture/' . $profile_picture . '" />';
     }
-    echo '<input type="file" id="profile_picture" name="profile_picture" class="form-control">';
-    echo '</div>';
-    echo '</div>';
+    $input .= '<input type="file" id="profile_picture" name="profile_picture" class="form-control">';
+    echo create_labeled_form_input('profile_picture', '{{ language:Profile Picture }}', $input);
 
-    echo '<div class="form-group">';
-    echo form_label('{{ language:User Name }}', ' for="" class="control-label col-sm-4');
-    echo '<div class="col-sm-8">';
-    echo $user_name;
-    echo '</div>';
-    echo '</div>';
+    echo create_labeled_form_input('user_name', '{{ language:User Name }}', $user_name);
 
-    echo '<div class="form-group">';
-    echo form_label('{{ language:Email }}', ' for="" class="control-label col-sm-4');
-    echo '<div class="col-sm-8">';
-    echo form_input('email', $email,
+    $input = form_input('email', $email,
         'id="email" placeholder="Email" class="form-control"');
-    echo '</div>';
-    echo '</div>';
+    echo create_labeled_form_input('email', '{{ language:Email }}', $input);
 
-    echo '<div class="form-group">';
-    echo form_label('{{ language:Real Name }}', ' for="" class="control-label col-sm-4');
-    echo '<div class="col-sm-8">';
-    echo form_input('real_name', $real_name,
+    $input = form_input('real_name', $real_name,
         'id="real_name" placeholder="Real Name" class="form-control"');
-    echo '</div>';
-    echo '</div>';
+    echo create_labeled_form_input('real_name', '{{ language:Real Name }}', $input);
 
-    echo '<div class="form-group">';
-    echo form_label('{{ language:Birthdate }}', ' for="" class="control-label col-sm-4');
-    echo '<div class="col-sm-8">';
-    echo form_input('birthdate', $birthdate,
+    $input = form_input('birthdate', $birthdate,
         'id="birthdate" placeholder="Birthdate" class="form-control datepicker-input"');
-    echo '</div>';
-    echo '</div>';
+    echo create_labeled_form_input('birthdate', '{{ language:Birthdate }}', $input);
 
-    echo '<div class="form-group">';
-    echo form_label('{{ language:Sex }}', ' for="" class="control-label col-sm-4');
-    echo '<div class="col-sm-8">';
     $options = array('' => '{{ language:Not Set }}', 'male' => '{{ language:Male }}', 'female' => '{{ language:Female }}');
-    echo '<select name="sex" id="sex" class="form-control chosen-select">';
+    $input = '<select name="sex" id="sex" class="form-control chosen-select">';
     foreach($options as $key=>$val){
         $selected = '';
         if($key == $sex){
             $selected = 'selected';
         }
-        echo '<option value="'.$key.'" '.$selected.'>' . $val . '</option>';
+        $input .= '<option value="'.$key.'" '.$selected.'>' . $val . '</option>';
     }
-    echo '</select>';
-    echo '</div>';
-    echo '</div>';
+    $input .= '</select>';
+    echo create_labeled_form_input('sex', '{{ language:Sex }}', $input);
 
-    echo '<div class="form-group">';
-    echo form_label('{{ language:Language }}', ' for="" class="control-label col-sm-4');
-    echo '<div class="col-sm-8">';
-    echo '<select name="language" id="language" class="form-control chosen-select">';
-    echo '<option value="">{{ language:Not Set }}</option>';
+    $input = '<select name="language" id="language" class="form-control chosen-select">';
+    $input .= '<option value="">{{ language:Not Set }}</option>';
     foreach($language_list as $language_option){
         $selected = '';
         if($language_option->code == $language){
             $selected = 'selected';
         }
-        echo '<option value="'.$language_option->code.'" '.$selected.'>' . $language_option->name . '</option>';
+        $input .= '<option value="'.$language_option->code.'" '.$selected.'>' . $language_option->name . '</option>';
     }
-    echo '</select>';
-    echo '</div>';
-    echo '</div>';
+    $input .= '</select>';
+    echo create_labeled_form_input('language', '{{ language:Language }}', $input);
 
-    echo '<div class="form-group">';
-    echo form_label('{{ language:Theme }}', ' for="" class="control-label col-sm-4');
-    echo '<div class="col-sm-8">';
-    echo '<select name="theme" id="theme" class="form-control chosen-select">';
-    echo '<option value="">{{ language:Not Set }}</option>';
+    $input = '<select name="theme" id="theme" class="form-control chosen-select">';
+    $input .= '<option value="">{{ language:Not Set }}</option>';
     foreach($theme_list as $theme_option){
         $selected = '';
         if($theme_option['path'] == $theme){
             $selected = 'selected';
         }
-        echo '<option value="'.$theme_option['path'].'" '.$selected.'>' . ucfirst($theme_option['path']) . '</option>';
+        $input .= '<option value="'.$theme_option['path'].'" '.$selected.'>' . ucfirst($theme_option['path']) . '</option>';
     }
-    echo '</select>';
-    echo '</div>';
-    echo '</div>';
+    $input .= '</select>';
+    echo create_labeled_form_input('theme', '{{ language:Theme }}', $input);
 
-    echo '<div class="form-group">';
-    echo form_label('{{ language:Self Description }}', ' for="" class="control-label col-sm-4');
-    echo '<div class="col-sm-8">';
-    echo form_textarea('self_description', $self_description,
+    $input = form_textarea('self_description', $self_description,
         'id="self_description" placeholder="Self Description" class="form-control"');
-    echo '</div>';
-    echo '</div>';
+    echo create_labeled_form_input('self_description', '{{ language:Self Description }}', $input);
 
     echo $additional_input;
 
-    echo '<div class="form-group">';
-    echo '<div class="col-sm-offset-4 col-sm-8">';
-    echo form_checkbox('change_password','True',FALSE);
-    echo form_label('{{ language:Change Password }}', ' for="" class="control-label');
-    echo '</div>';
-    echo '</div>';
+    $input = form_checkbox('change_password','True',FALSE, 'id="change_password"');
+    $input .= form_label('{{ language:Change Password }}', 'change_password', 'class="control-label');
+    echo create_labeled_form_input('change_password', '', $input);
 
-    echo '<div class="form-group password-input">';
-    echo form_label('{{ language:Password }}', ' for="" class="control-label col-sm-4');
-    echo '<div class="col-sm-8">';
-    echo form_password('password', '',
-        'id="password" placeholder="Password" class="form-control"');
-    echo '</div>';
-    echo '</div>';
+    echo '<div class="password-input">';
+        $input = form_password('password', '',
+            'id="password" placeholder="Password" class="form-control"');
+        echo create_labeled_form_input('password', '{{ language:Password }}', $input);
 
-    echo '<div class="form-group password-input">';
-    echo form_label('{{ language:Confirm Password }}', ' for="" class="control-label col-sm-4');
-    echo '<div class="col-sm-8">';
-    echo form_password('confirm_password', '',
-        'id="confirm_password" placeholder="Password (again)" class="form-control"');
-    echo '</div>';
+        $input = form_password('confirm_password', '',
+            'id="confirm_password" placeholder="Password (again)" class="form-control"');
+        echo create_labeled_form_input('confirm_password', '{{ language:Confirm Password }}', $input);
     echo '</div>';
 
     echo '<div class="form-group"><div class="col-sm-offset-4 col-sm-8">';
diff --git a/modules/main/views/main_register.php b/modules/main/views/main_register.php
index 06f03117..5e053231 100755
--- a/modules/main/views/main_register.php
+++ b/modules/main/views/main_register.php
@@ -8,8 +8,8 @@
     }
 </style>
 <script type="text/javascript">
-	var REQUEST_EXISTS = false;
-	var REQUEST = "";
+    var REQUEST_EXISTS = false;
+    var REQUEST = "";
     function check_register(){
         var user_name =  $('input[name="<?php echo $secret_code; ?>user_name"]').val();
         var email = $('input[name="<?php echo $secret_code; ?>email"]').val();
@@ -17,7 +17,7 @@ function check_register(){
         var confirm_password = $('input[name="<?php echo $secret_code; ?>confirm_password"]').val();
         $("#img_ajax_loader").show();
         if(REQUEST_EXISTS){
-        	REQUEST.abort();
+            REQUEST.abort();
         }
         REQUEST_EXISTS = true;
         // build request data
@@ -35,7 +35,7 @@ function check_register(){
             "data" : request_data,
             "dataType" : "json",
             "success" : function(data){
-            	if(!data.error && !data.exists && user_name!='' && password!='' && password==confirm_password){
+                if(!data.error && !data.exists && user_name!='' && password!='' && password==confirm_password){
                     $('input[name="register"]').show();
                     $('input[name="register"]').removeAttr('disabled');
                     console.log($('input[name="register"]'));
@@ -44,7 +44,7 @@ function check_register(){
                     $('input[name="register"]').attr('disabled', 'disabled');
                 }
 
-            	// get message from server + local check
+                // get message from server + local check
                 var message = '';
                 if(data.message!=''){
                     message += data.message+'<br />';
@@ -83,7 +83,7 @@ function capitaliseFirstLetter(string)
             check_register();
         });
         $('input, select, textarea').change(function(){
-        	check_register();
+            check_register();
         });
 
         $('#<?php echo $secret_code; ?>user_name').keyup(function(){
@@ -102,50 +102,15 @@ function capitaliseFirstLetter(string)
     echo form_input(array('name'=>'password', 'value'=>'', 'class'=>'register_input'));
     echo form_input(array('name'=>'confirm_password', 'value'=>'', 'class'=>'register_input'));
 
-    echo '<div class="form-group">';
-    echo form_label('{{ language:User Name }}', ' for="" class="control-label col-sm-4');
-    echo '<div class="col-sm-8">';
-    echo form_input($secret_code.'user_name', $user_name,
-        'id="'.$secret_code.'user_name" placeholder="User Name" class="form-control"');
-    echo '</div>';
-    echo '</div>';
-
-    echo '<div class="form-group">';
-    echo form_label('{{ language:Email }}', ' for="" class="control-label col-sm-4');
-    echo '<div class="col-sm-8">';
-    echo form_input($secret_code.'email', $email,
-        'id="'.$secret_code.'email" placeholder="Email" class="form-control"');
-    echo '</div>';
-    echo '</div>';
-
-    echo '<div class="form-group">';
-    echo form_label('{{ language:Real Name }}', ' for="" class="control-label col-sm-4');
-    echo '<div class="col-sm-8">';
-    echo form_input($secret_code.'real_name', $real_name,
-        'id="'.$secret_code.'real_name" placeholder="Real Name" class="form-control"');
-    echo '</div>';
-    echo '</div>';
-
-    echo '<div class="form-group">';
-    echo form_label('{{ language:Password }}', ' for="" class="control-label col-sm-4');
-    echo '<div class="col-sm-8">';
-    echo form_password($secret_code.'password', '',
-        'id="'.$secret_code.'password" placeholder="Password" class="form-control"');
-    echo '</div>';
-    echo '</div>';
-
-    echo '<div class="form-group">';
-    echo form_label('{{ language:Confirm Password }}', ' for="" class="control-label col-sm-4');
-    echo '<div class="col-sm-8">';
-    echo form_password($secret_code.'confirm_password', '',
-        'id="'.$secret_code.'confirm_password" placeholder="Password (again)" class="form-control"');
-    echo '</div>';
-    echo '</div>';
+    echo build_register_input($secret_code, $user_name, $email, $real_name);
 
     // additional input from hook
-    echo $additional_input;
+    if(trim($additional_input) != ''){
+        echo '<hr />';
+        echo $additional_input;
+    }
 
-    echo '<div class="form-group"><div class="col-sm-offset-4 col-sm-8">';
+    echo '<div class="form-group"><div class="col-sm-12">';
     echo '<img id="img_ajax_loader" style="display:none;" src="'.base_url('assets/nocms/images/ajax-loader.gif').'" /><br />';
     echo '<div id="message" class="alert alert-danger"></div>';
     echo form_submit('register', $register_caption, 'id="btn-register" class="btn btn-primary" style="display:none;"');
diff --git a/modules/multisite/views/register.php b/modules/multisite/views/register.php
index 0107d3b2..9e87c571 100755
--- a/modules/multisite/views/register.php
+++ b/modules/multisite/views/register.php
@@ -32,145 +32,77 @@
 
                 echo '<div class="tab-pane active" id="tab1">';
                     echo '<h4>User Information</h4>';
-
-                    echo '<div class="form-group">';
-                    echo form_label('{{ language:User Name }}', ' for="" class="control-label col-sm-4');
-                    echo '<div class="col-sm-8">';
-                    echo form_input($secret_code.'user_name', $user_name,
-                        'id="'.$secret_code.'user_name" placeholder="User Name" class="form-control"');
-                    echo '</div>';
-                    echo '</div>';
-
-                    echo '<div class="form-group">';
-                    echo form_label('{{ language:Email }}', ' for="" class="control-label col-sm-4');
-                    echo '<div class="col-sm-8">';
-                    echo form_input($secret_code.'email', $email,
-                        'id="'.$secret_code.'email" placeholder="Email" class="form-control"');
-                    echo '</div>';
-                    echo '</div>';
-
-                    echo '<div class="form-group">';
-                    echo form_label('{{ language:Real Name }}', ' for="" class="control-label col-sm-4');
-                    echo '<div class="col-sm-8">';
-                    echo form_input($secret_code.'real_name', $real_name,
-                        'id="'.$secret_code.'real_name" placeholder="Real Name" class="form-control"');
-                    echo '</div>';
-                    echo '</div>';
-
-                    echo '<div class="form-group">';
-                    echo form_label('{{ language:Password }}', ' for="" class="control-label col-sm-4');
-                    echo '<div class="col-sm-8">';
-                    echo form_password($secret_code.'password', '',
-                        'id="'.$secret_code.'password" placeholder="Password" class="form-control"');
-                    echo '</div>';
-                    echo '</div>';
-
-                    echo '<div class="form-group">';
-                    echo form_label('{{ language:Confirm Password }}', ' for="" class="control-label col-sm-4');
-                    echo '<div class="col-sm-8">';
-                    echo form_password($secret_code.'confirm_password', '',
-                        'id="'.$secret_code.'confirm_password" placeholder="Password (again)" class="form-control"');
-                    echo '</div>';
-                    echo '</div>';
+                    echo build_register_input($secret_code, $user_name, $email, $real_name);
                 echo '</div>';
 
                 echo '<div class="tab-pane" id="tab2">';
                     echo '<h4>Site Information</h4>';
 
-                    echo '<div class="form-group">';
-                    echo form_label('{{ language:Site Title }}', ' for="" class="control-label col-sm-4');
-                    echo '<div class="col-sm-8">';
-                    echo form_input('site_title', '',
-                        'id="site_title" placeholder="Site Title" class="form-control"');
-                    echo '</div>';
-                    echo '</div>';
+                    echo create_labeled_form_input('site_title', '{{ language:Site Title }}',
+                        form_input('site_title', '', 'id="{{ id }}" placeholder="Site Title" class="form-control"')
+                    );
 
-                    echo '<div class="form-group">';
-                    echo form_label('{{ language:Site Slogan }}', ' for="" class="control-label col-sm-4');
-                    echo '<div class="col-sm-8">';
-                    echo form_input('site_slogan', '',
-                        'id="site_slogan" placeholder="Site Slogan" class="form-control"');
-                    echo '</div>';
-                    echo '</div>';
+                    echo create_labeled_form_input('site_logo', '{{ language:Site Logo }}',
+                        form_input('site_slogan', '', 'id="{{ id }}" placeholder="Site Slogan" class="form-control"')
+                    );
 
-                    echo '<div class="form-group">';
-                    echo form_label('{{ language:Site Logo }}', ' for="" class="control-label col-sm-4');
-                    echo '<div class="col-sm-8">';
-                    echo '<input type="file" name="site_logo" id="site_logo" class="form-control" />';
-                    echo '</div>';
-                    echo '</div>';
+                    echo create_labeled_form_input('site_logo', '{{ language:Site Logo }}',
+                        '<input type="file" name="site_logo" id="{{ id }}" class="form-control" />'
+                    );
+
+                    echo create_labeled_form_input('site_favicon', '{{ language:Site Favicon }}',
+                        '<input type="file" name="site_favicon" id="{{ id }}" class="form-control" />'
+                    );
 
-                    echo '<div class="form-group">';
-                    echo form_label('{{ language:Site Favicon }}', ' for="" class="control-label col-sm-4');
-                    echo '<div class="col-sm-8">';
-                    echo '<input type="file" name="site_favicon" id="site_favicon" class="form-control" />';
-                    echo '</div>';
-                    echo '</div>';
                 echo '</div>';
 
                 echo '<div class="tab-pane" id="tab3">';
                     echo '<h4>Site Appearance</h4>';
 
-                    echo'<div class="form-group">';
-                    echo'<label class="control-label col-md-4" for="homepage_layout">Homepage Layout</label>';
-                    echo'<div class="controls col-md-8">';
-                    echo'<select id="homepage_layout" name="homepage_layout" class="input form-control" placeholder="Homepage Layout">';
+                    $input = '<select id="{{ id }}" name="homepage_layout" class="input form-control" placeholder="Homepage Layout">';
                     foreach($layout_list as $homepage_layout){
                         $selected = $homepage_layout == 'slide'? 'selected' : '';
-                        echo '<option value="'.$homepage_layout.'" '.$selected.'>'.$homepage_layout.'</option>';
+                        $input .= '<option value="'.$homepage_layout.'" '.$selected.'>'.$homepage_layout.'</option>';
                     }
-                    echo'</select>';
-                    echo'</div>';
-                    echo'</div>';
+                    $input .= '</select>';
+                    echo create_labeled_form_input('homepage_layout', '{{ language:Homepage Layout }}', $input);
 
-                    echo'<div class="form-group">';
-                    echo'<label class="control-label col-md-4" for="default_layout">Default Layout</label>';
-                    echo'<div class="controls col-md-8">';
-                    echo'<select id="default_layout" name="default_layout" class="input form-control" placeholder="Default Layout">';
+                    $input = '<select id="default_layout" name="default_layout" class="input form-control" placeholder="Default Layout">';
                     foreach($layout_list as $default_layout){
                         $selected = $default_layout == 'default'? 'selected' : '';
-                        echo '<option value="'.$default_layout.'" '.$selected.'>'.$default_layout.'</option>';
+                        $input .= '<option value="'.$default_layout.'" '.$selected.'>'.$default_layout.'</option>';
                     }
-                    echo'</select>';
-                    echo'</div>';
-                    echo'</div>';
+                    $input .= '</select>';
+                    echo create_labeled_form_input('default_layout', '{{ language:Default Layout }}', $input);
 
-                    echo'<div class="form-group">';
-                    echo'<label class="control-label col-md-4" for="theme">Theme</label>';
-                    echo'<div class="controls col-md-8">';
-                    echo'<select id="theme" name="theme" class="input form-control" placeholder="Theme">';
+                    $input = '<select id="theme" name="theme" class="input form-control" placeholder="Theme">';
                     foreach($theme_list as $theme){
                         $selected = $theme == 'neutral'? 'selected' : '';
-                        echo '<option value="'.$theme.'" '.$selected.'>'.$theme.'</option>';
+                        $input .=  '<option value="'.$theme.'" '.$selected.'>'.$theme.'</option>';
                     }
-                    echo'</select>';
-                    echo'<p class="help-block">Theme used for the new site</p>';
-                    echo'<div>';
+                    $input .= '</select>';
+                    $input .= '<p class="help-block">Theme used for the new site</p>';
+                    $input .= '<div>';
                     foreach($theme_list as $theme){
-                        echo '<img style="width:100%; display:none;" class="img-theme" id="img-theme-'.str_replace(' ','_',$theme).'" real-src="{{ base_url }}themes/'.$theme.'/preview.png" />';
+                        $input .= '<img style="width:100%; display:none;" class="img-theme" id="img-theme-'.str_replace(' ','_',$theme).'" real-src="{{ base_url }}themes/'.$theme.'/preview.png" />';
                     }
-                    echo'</div>';
-                    echo'</div>';
-                    echo'</div>';
+                    $input .= '</div>';
+                    echo create_labeled_form_input('theme', '{{ language:Theme }}', $input);
 
-                    echo'<div class="form-group">';
-                    echo'<label class="control-label col-md-4" for="template">Template</label>';
-                    echo'<div class="controls col-md-8">';
-                    echo'<select id="template" name="template" class="input form-control" placeholder="template">';
+                    $input = '<select id="template" name="template" class="input form-control" placeholder="template">';
                     foreach($template_list as $template){
-                        echo '<option value="'.$template['name'].'">'.$template['name'].'</option>';
+                        $input .=  '<option value="'.$template['name'].'">'.$template['name'].'</option>';
                     }
-                    echo'</select>';
-                    echo'<p class="help-block">Template used for the new site</p>';
-                    echo'<div>';
+                    $input .= '</select>';
+                    $input .= '<p class="help-block">Template used for the new site</p>';
+                    $input .= '<div>';
                     foreach($template_list as $template){
                         $template_name = str_replace(' ','_',$template['name']);
-                        echo '<img style="width:100%; display:none;" class="img-template" id="img-template-'.$template_name.'" real-src="{{ module_base_url }}assets/uploads/'.$template['icon'].'" />';
-                        echo '<p style="display:none;" class="desc-template" id="desc-template-'.$template_name.'">'.$template['description'].'</p>';
+                        $input .=  '<img style="width:100%; display:none;" class="img-template" id="img-template-'.$template_name.'" real-src="{{ module_base_url }}assets/uploads/'.$template['icon'].'" />';
+                        $input .=  '<p style="display:none;" class="desc-template" id="desc-template-'.$template_name.'">'.$template['description'].'</p>';
                     }
-                    echo'</div>';
-                    echo'</div>';
-                    echo'</div>';
+                    $input .= '</div>';
+                    echo create_labeled_form_input('template', '{{ language:Template }}', $input);
                 echo '</div>';
 
                 // from hook
@@ -181,7 +113,7 @@
                     echo '</div>';
                 }
 
-                echo '<div class="form-group"><div class="col-sm-offset-4 col-sm-8">';
+                echo '<div class="form-group"><div class="col-sm-12">';
                 echo '<img id="img_ajax_loader" style="display:none;" src="'.base_url('assets/nocms/images/ajax-loader.gif').'" /><br />';
                 echo '<div id="message" class="alert alert-danger"></div>';
                 echo form_submit('register', $register_caption, 'id="btn-register" class="btn btn-primary" style="display:none;"');
@@ -286,7 +218,7 @@ function adjust_template(){
             check_register();
         });
         $('input, select, textarea').change(function(){
-        	check_register();
+            check_register();
         });
 
         $('#<?php echo $secret_code; ?>user_name').keyup(function(){
diff --git a/readme.md b/readme.md
index bbd13ccd..ee806f3e 100755
--- a/readme.md
+++ b/readme.md
@@ -39,7 +39,7 @@ No-CMS come with several batteries included:
 Release Information
 ===================
 
-- v1.1.3, Oct, 22, 2016
+- v1.1.3, Oct, 24, 2016
 
 
 Server Requirements