Merge branch 'master' of https://github.com/friendica/red

5 files changed, 28 insertions, 9 deletions

diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index ab2bd1b3d..47613c200 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -1107,12 +1107,6 @@ footer {
 	margin-bottom: 15px;
 }
 
-#language-selector {
-	position: absolute;
-	top: 0px;
-	left: 16px;
-}
-
 #group-members {
 	margin-top: 20px;
 	padding: 10px;
diff --git a/view/tpl/hdr.tpl b/view/tpl/hdr.tpl
index b0d936742..f1e78b897 100644
--- a/view/tpl/hdr.tpl
+++ b/view/tpl/hdr.tpl
@@ -4,5 +4,4 @@
 	<li class="{5}"><a href="{0}" title="{2} {3}"><img src="{1}"><span class='contactname'>{2}</span>{3}<br><span class="notif-when">{4}</span></a></li>
 </ul>
 
-{{if $langselector}}<div id="langselector" >{{$langselector}}</div>{{/if}}
 <div id="panel" style="display: none;"></div>
diff --git a/view/tpl/lang_selector.tpl b/view/tpl/lang_selector.tpl
index 159eeea7e..b512c759b 100755
--- a/view/tpl/lang_selector.tpl
+++ b/view/tpl/lang_selector.tpl
@@ -1,5 +1,6 @@
-<div id="lang-select-icon" title="{{$title}}" onclick="openClose('language-selector');" ><i class="icon-flag"></i></div>
-<div id="language-selector" style="display: none;" >
+<h1>{{$title}}</h1>
+<br />
+<div id="language-selector" >
 	<form action="#" method="post" >
 		<select name="system_language" onchange="this.form.submit();" >
 			{{foreach $langs.0 as $v=>$l}}
diff --git a/view/tpl/pdledit.tpl b/view/tpl/pdledit.tpl
new file mode 100644
index 000000000..ef8ff8dce
--- /dev/null
+++ b/view/tpl/pdledit.tpl
@@ -0,0 +1,21 @@
+<h1>{{$header}}</h1>
+
+<h2>{{$mname}} {{$module}}</h2>
+
+<br />
+<a href="help/Comanche" target="redmatrix-help">{{$help}}</a>
+<br />
+<br />
+
+
+
+<form action="pdledit" method="post" >
+<input type="hidden" name="module" value="{{$module}}" />
+<textarea rows="24" cols="80" name="content">{{$content}}</textarea>
+
+<br />
+<input type="submit" name="submit" value="{{$submit}}" />
+
+</form>
+
+
diff --git a/view/tpl/settings_display.tpl b/view/tpl/settings_display.tpl
index a8fb002fb..924b4b33f 100755
--- a/view/tpl/settings_display.tpl
+++ b/view/tpl/settings_display.tpl
@@ -16,6 +16,10 @@
 <input type="submit" name="submit" class="settings-submit" value="{{$submit}}" />
 </div>
 
+<br />
+<a href="pdledit">{{$layout_editor}}</a>
+<br />
+
 {{if $theme_config}}
 <h2>Theme settings</h2>
 {{$theme_config}}