From 5b3c29178704c047d4020df2ae445ff01c6e1f3a Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Mon, 22 Jun 2015 08:48:27 -0400
Subject: [PATCH] Merge branch 'master' into 'master'

---
 interface/web/admin/templates/system_config_misc_edit.htm |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/interface/web/admin/templates/system_config_misc_edit.htm b/interface/web/admin/templates/system_config_misc_edit.htm
index e8b6889..d5dc139 100644
--- a/interface/web/admin/templates/system_config_misc_edit.htm
+++ b/interface/web/admin/templates/system_config_misc_edit.htm
@@ -12,6 +12,9 @@
                 <div class="col-sm-9" id="used_logo">{tmpl_var name='used_logo'}</div>
 			</div>
             <div class="form-group">
+                <label for="page_title" class="col-sm-3 control-label">{tmpl_var name='company_name_txt'}</label>
+                <div class="col-sm-9"><input type="text" name="company_name" id="company_name" value="{tmpl_var name='company_name'}" size="" maxlength="" class="form-control" /></div></div>
+            <div class="form-group">
                 <label for="dashboard_atom_url_admin" class="col-sm-3 control-label">{tmpl_var name='dashboard_atom_url_admin_txt'}</label>
                 <div class="col-sm-9"><input type="text" name="dashboard_atom_url_admin" id="dashboard_atom_url_admin" value="{tmpl_var name='dashboard_atom_url_admin'}" size="" maxlength="" class="form-control" /></div></div>
             <div class="form-group">
@@ -183,4 +186,4 @@
 		});
 	}
 	
-</script>
\ No newline at end of file
+</script>

--
Gitblit v1.9.1