aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-03-05 03:19:20 -0800
committerfriendica <info@friendica.com>2014-03-05 03:19:20 -0800
commit61f47cd5ed6eee337d9ab30b65844b5118080b76 (patch)
tree03fabd542a446845640dff27e3b677718b7c409e
parentcdcbc5816e21d53172c5396083b38fce4ab0ba38 (diff)
downloadvolse-hubzilla-61f47cd5ed6eee337d9ab30b65844b5118080b76.tar.gz
volse-hubzilla-61f47cd5ed6eee337d9ab30b65844b5118080b76.tar.bz2
volse-hubzilla-61f47cd5ed6eee337d9ab30b65844b5118080b76.zip
move language selector to a module
-rw-r--r--include/nav.php1
-rw-r--r--mod/lang.php6
-rw-r--r--version.inc2
-rw-r--r--view/theme/redbasic/css/style.css6
-rw-r--r--view/tpl/hdr.tpl1
-rwxr-xr-xview/tpl/lang_selector.tpl5
6 files changed, 10 insertions, 11 deletions
diff --git a/include/nav.php b/include/nav.php
index ab0eaa855..3aa50226d 100644
--- a/include/nav.php
+++ b/include/nav.php
@@ -59,7 +59,6 @@ EOT;
$a->page['header'] .= replace_macros(get_markup_template('hdr.tpl'), array(
'$baseurl' => $a->get_baseurl(),
'$sitelocation' => $sitelocation,
- '$langselector' => ((get_config('system','select_language')) ? lang_selector() : ''),
'$banner' => $banner
));
diff --git a/mod/lang.php b/mod/lang.php
new file mode 100644
index 000000000..fba5f9c73
--- /dev/null
+++ b/mod/lang.php
@@ -0,0 +1,6 @@
+<?php
+
+function lang_content(&$a) {
+ return lang_selector();
+}
+
diff --git a/version.inc b/version.inc
index 8750b1afe..77040f467 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2014-03-04.606
+2014-03-05.607
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}}