aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/nav.php9
-rw-r--r--include/template_processor.php20
-rw-r--r--index.php15
-rw-r--r--mod/admin.php337
-rw-r--r--view/admin_aside.tpl20
-rw-r--r--view/admin_plugins.tpl14
-rw-r--r--view/admin_site.tpl45
-rw-r--r--view/admin_summary.tpl36
-rw-r--r--view/field.tpl4
-rw-r--r--view/field_checkbox.tpl6
-rw-r--r--view/field_input.tpl6
-rw-r--r--view/field_select.tpl8
-rw-r--r--view/field_textarea.tpl6
-rw-r--r--view/it/strings.php2
-rw-r--r--view/nav.tpl2
-rw-r--r--view/theme/duepuntozero/style.css69
16 files changed, 593 insertions, 6 deletions
diff --git a/include/nav.php b/include/nav.php
index b37863aa1..238d87035 100644
--- a/include/nav.php
+++ b/include/nav.php
@@ -107,10 +107,15 @@ function nav(&$a) {
$nav['settings'] = array('settings', t('Settings'),"");
$nav['profiles'] = array('profiles', t('Profiles'),"");
$nav['contacts'] = array('contacts', t('Contacts'),"");
-
-
}
+ /**
+ * Admin page
+ */
+ if (is_site_admin()){
+ $nav['admin'] = array('admin/', t('Admin'), "");
+ }
+
/**
*
diff --git a/include/template_processor.php b/include/template_processor.php
index d8dfbaedb..a2c24b00b 100644
--- a/include/template_processor.php
+++ b/include/template_processor.php
@@ -41,9 +41,24 @@
* IF node
*
* {{ if <$var> }}...{{ endif }}
+ * {{ if <$var>==<val|$var> }}...{{ endif }}
+ * {{ if <$var>!=<val|$var> }}...{{ endif }}
*/
private function _replcb_if($args){
- $val = $this->_get_var($args[2]);
+
+ if (strpos($args[2],"==")>0){
+ list($a,$b) = array_map("trim",explode("==",$args[2]));
+ $a = $this->_get_var($a);
+ if ($b[0]=="$") $b = $this->_get_var($b);
+ $val = ($a == $b);
+ } else if (strpos($args[2],"!=")>0){
+ list($a,$b) = explode("!=",$args[2]);
+ $a = $this->_get_var($a);
+ if ($b[0]=="$") $b = $this->_get_var($b);
+ $val = ($a != $b);
+ } else {
+ $val = $this->_get_var($args[2]);
+ }
return ($val?$args[3]:"");
}
@@ -58,7 +73,8 @@
list($keyname, $varname) = explode("=>",$m[1]);
if (is_null($varname)) { $varname=$keyname; $keyname=""; }
if ($m[0]=="" || $varname=="" || is_null($varname)) die("template error: 'for ".$m[0]." as ".$varname."'") ;
- $vals = $this->r[$m[0]];
+ //$vals = $this->r[$m[0]];
+ $vals = $this->_get_var($m[0]);
$ret="";
if (!is_array($vals)) return $ret;
foreach ($vals as $k=>$v){
diff --git a/index.php b/index.php
index 534cb93f7..9bca1527b 100644
--- a/index.php
+++ b/index.php
@@ -29,7 +29,6 @@ $install = ((file_exists('.htconfig.php') && filesize('.htconfig.php')) ? false
@include(".htconfig.php");
-
$lang = get_language();
load_translation_table($lang);
@@ -46,6 +45,20 @@ $db = new dba($db_host, $db_user, $db_pass, $db_data, $install);
/**
+ * Load configs from db. Overwrite configs from .htconfig.php
+ */
+$r = q("SELECT * FROM `config` WHERE `cat` IN ('system', 'config')");
+foreach ($r as $c) {
+ if ($c['cat']=='config') {
+ $a->config[$c['k']] = $c['v'];
+ } else {
+ $a->config[$c['cat']][$c['k']] = $c['v'];
+ }
+}
+unset($r);
+
+
+/**
*
* Important stuff we always need to do.
* Initialise authentication and date and time.
diff --git a/mod/admin.php b/mod/admin.php
new file mode 100644
index 000000000..f9d248210
--- /dev/null
+++ b/mod/admin.php
@@ -0,0 +1,337 @@
+<?php
+ /**
+ * Friendika admin
+ */
+
+
+function admin_init(&$a) {
+ if(!is_site_admin()) {
+ notice( t('Permission denied.') . EOL);
+ return;
+ }
+}
+
+function admin_post(&$a){
+ if(!is_site_admin()) {
+ return login(false);
+ }
+
+ // urls
+ if ($a->argc > 1){
+ switch ($a->argv[1]){
+ case 'site': {
+ admin_page_site_post($a);
+ break;
+ }
+ }
+ }
+
+ goaway($a->get_baseurl() . '/admin' );
+ return; // NOTREACHED
+}
+
+function admin_content(&$a) {
+
+ if(!is_site_admin()) {
+ return login(false);
+ }
+
+ /**
+ * Side bar links
+ */
+
+ // array( url, name, extra css classes )
+ $aside = Array(
+ 'site' => Array($a->get_baseurl()."/admin/site/", t("Site") , "site"),
+ 'users' => Array($a->get_baseurl()."/admin/users/", t("Users") , "users"),
+ 'plugins'=> Array($a->get_baseurl()."/admin/plugins/", t("Plugins") , "plugins")
+ );
+
+ /* get plugins admin page */
+
+ $r = q("SELECT * FROM `hook` WHERE `hook`='plugin_admin'");
+ $aside['plugins_admin']=Array();
+ foreach ($r as $h){
+ $plugin = explode("/",$h['file']); $plugin = $plugin[1];
+ $aside['plugins_admin'][] = Array($a->get_baseurl()."/admin/plugins/".$plugin, $plugin, "plugin");
+ }
+
+ $aside['logs'] = Array($a->get_baseurl()."/admin/logs/", t("Logs"), "logs");
+
+ $t = get_markup_template("admin_aside.tpl");
+ $a->page['aside'] = replace_macros( $t, array(
+ '$admin' => $aside,
+ '$admurl'=> $a->get_baseurl()."/admin/"
+ ));
+
+
+
+ /**
+ * Page content
+ */
+ $o = '';
+
+ // urls
+ if ($a->argc > 1){
+ switch ($a->argv[1]){
+ case 'site':
+ $o = admin_page_site($a);
+ break;
+ case 'users':
+ $o = admin_page_users($a);
+ break;
+ case 'plugins':
+ $o = admin_page_plugins($a);
+ break;
+ default:
+ notice( t("Item not found.") );
+ }
+ } else {
+ $o = admin_page_summary($a);
+ }
+ return $o;
+}
+
+
+/**
+ * Admin Summary Page
+ */
+function admin_page_summary(&$a) {
+ $r = q("SELECT `page-flags`, COUNT(uid) as `count` FROM `user` GROUP BY `page-flags`");
+ $accounts = Array(
+ Array( t('Normal Account'), 0),
+ Array( t('Soapbox Account'), 0),
+ Array( t('Community/Celebrity Account'), 0),
+ Array( t('Automatic Friend Account'), 0)
+ );
+ $users=0;
+ foreach ($r as $u){ $accounts[$u['page-flags']][1] = $u['count']; $users+=$u['count']; }
+
+
+ $r = q("SELECT COUNT(id) as `count` FROM `register`");
+ $pending = $r[0]['count'];
+
+
+
+
+
+ $t = get_markup_template("admin_summary.tpl");
+ return replace_macros($t, array(
+ '$title' => t('Administration'),
+ '$page' => t('Summary'),
+ '$users' => Array( t('Registered users'), $users),
+ '$accounts' => $accounts,
+ '$pending' => Array( t('Pending registrations'), $pending),
+ '$version' => Array( t('Version'), FRIENDIKA_VERSION),
+ '$build' => get_config('system','build'),
+ '$plugins' => Array( t('Active plugins'), $a->plugins )
+ ));
+}
+
+
+/**
+ * Admin Site Page
+ */
+function admin_page_site_post(&$a){
+ if (!x($_POST,"page_site")){
+ return;
+ }
+
+
+ $sitename = ((x($_POST,'sitename')) ? notags(trim($_POST['sitename'])) : '');
+ $banner = ((x($_POST,'banner')) ? trim($_POST['banner']) : false);
+ $language = ((x($_POST,'language')) ? notags(trim($_POST['language'])) : '');
+ $theme = ((x($_POST,'theme')) ? notags(trim($_POST['theme'])) : '');
+ $maximagesize = ((x($_POST,'maximagesize')) ? intval(trim($_POST['maximagesize'])) : 0);
+ $allowed_sites = ((x($_POST,'allowed_sites')) ? notags(trim($_POST['allowed_sites'])) : '');
+ $allowed_email = ((x($_POST,'allowed_email')) ? notags(trim($_POST['allowed_email'])) : '');
+ $block_public = ((x($_POST,'block_public')) ? True : False);
+ $force_publish = ((x($_POST,'publish_all')) ? True : False);
+ $global_directory = ((x($_POST,'directory_submit_url')) ? notags(trim($_POST['directory_submit_url'])) : '');
+ $global_search_url = ((x($_POST,'directory_search_url'))? notags(trim($_POST['directory_search_url'])) : '');
+ $no_multi_reg = ((x($_POST,'no_multi_reg')) ? True : False);
+ $no_openid = ((x($_POST,'no_openid')) ? True : False);
+ $no_gravatar = ((x($_POST,'no_gravatar')) ? True : False);
+ $no_regfullname = ((x($_POST,'no_regfullname')) ? True : False);
+ $no_utf = ((x($_POST,'no_utf')) ? True : False);
+ $rino_enc = ((x($_POST,'rino_enc')) ? True : False);
+ $verifyssl = ((x($_POST,'verifyssl')) ? True : False);
+ $proxyuser = ((x($_POST,'proxyuser')) ? notags(trim($_POST['global_search_url'])) : '');
+ $proxy = ((x($_POST,'proxy')) ? notags(trim($_POST['global_search_url'])) : '');
+ $timeout = ((x($_POST,'timeout')) ? intval(trim($_POST['timeout'])) : 60);
+
+
+ $a->config['sitename'] = $sitename;
+ if ($banner==""){
+ // don't know why, but del_config doesn't work...
+ q("DELETE FROM `config` WHERE `cat` = '%s' AND `k` = '%s' LIMIT 1",
+ dbesc("system"),
+ dbesc("banner")
+ );
+ } else {
+ set_config('system','banner', $banner);
+ }
+ set_config('system','language', $language);
+ set_config('system','theme', $theme);
+ set_config('system','maximagesize', $maximagesize);
+ set_config('system','allowed_sites', $allowed_sites);
+ set_config('system','allowed_email', $allowed_email);
+ set_config('system','block_public', $block_public);
+ set_config('system','publish_all', $force_publish);
+ if ($global_directory==""){
+ // don't know why, but del_config doesn't work...
+ q("DELETE FROM `config` WHERE `cat` = '%s' AND `k` = '%s' LIMIT 1",
+ dbesc("system"),
+ dbesc("directory_submit_url")
+ );
+ } else {
+ set_config('system','directory_submit_url', $global_directory);
+ }
+ set_config('system','directory_search_url', $global_search_url);
+ set_config('system','block_extended_register', $no_multi_reg);
+ set_config('system','no_openid', $no_openid);
+ set_config('system','no_gravatar', $no_gravatar);
+ set_config('system','no_regfullname', $no_regfullname);
+ set_config('system','proxy', $no_utf);
+ set_config('system','rino_encrypt', $rino_enc);
+ set_config('system','verifyssl', $verifyssl);
+ set_config('system','proxyuser', $proxyuser);
+ set_config('system','proxy', $proxy);
+ set_config('system','curl_timeout', $timeout);
+
+ $r = q("SELECT * FROM `config` WHERE `cat`='config' AND `k`='sitename'");
+ if (count($r)>0){
+ q("UPDATE `config` SET `v`='%s' WHERE `cat`='config' AND `k`='sitename'",
+ dbesc($a->config['sitename'])
+ );
+ } else {
+ q("INSERT INTO `config` ( `cat`, `k`, `v` ) VALUES ( 'config', 'sitename', '%s' )",
+ dbesc($a->config['sitename'])
+ );
+ }
+
+
+
+ goaway($a->get_baseurl() . '/admin/site' );
+ return; // NOTREACHED
+
+}
+
+function admin_page_site(&$a) {
+
+ /* Installed langs */
+ $lang_choices = array();
+ $langs = glob('view/*/strings.php');
+
+ if(is_array($langs) && count($langs)) {
+ if(! in_array('view/en/strings.php',$langs))
+ $langs[] = 'view/en/';
+ asort($langs);
+ foreach($langs as $l) {
+ $t = explode("/",$l);
+ $lang_choices[$t[1]] = $t[1];
+ }
+ }
+
+ /* Installed themes */
+ $theme_choices = array();
+ $files = glob('view/theme/*');
+ if($files) {
+ foreach($files as $file) {
+ $f = basename($file);
+ $theme_name = ((file_exists($file . '/experimental')) ? sprintf("%s - \x28Experimental\x29", $f) : $f);
+ $theme_choices[$f] = $theme_name;
+ }
+ }
+
+
+ /* Banner */
+ $banner = get_config('system','banner');
+ if($banner == false)
+ $banner = htmlspecialchars('<a href="http://project.friendika.com"><img id="logo-img" src="images/friendika-32.png" alt="logo" /></a><span id="logo-text"><a href="http://project.friendika.com">Friendika</a></span>');
+
+ //echo "<pre>"; var_dump($lang_choices); die("</pre>");
+
+
+
+ $t = get_markup_template("admin_site.tpl");
+ return replace_macros($t, array(
+ '$title' => t('Administration'),
+ '$page' => t('Site'),
+ '$submit' => t('Submit'),
+ '$baseurl' => $a->get_baseurl(),
+
+ // name, label, value, help string, extra data...
+ '$sitename' => array('sitename', t("Site name"), $a->config['sitename'], ""),
+ '$banner' => array('banner', t("Banner/Logo"), $banner, ""),
+ '$language' => array('language', t("System language"), get_config('system','language'), "", $lang_choices),
+ '$theme' => array('theme', t("System theme"), get_config('system','theme'), "Default system theme (which may be over-ridden by user profiles)", $theme_choices),
+
+ '$maximagesize' => array('maximagesize', t("Maximum image size"), get_config('system','maximagesize'), "Maximum size in bytes of uploaded images. Default is 0, which means no limits."),
+
+ '$allowed_sites' => array('allowed_sites', t("Allowed friend domains"), get_config('system','allowed_sites'), "Comma separated list of domains which are allowed to establish friendships with this site. Wildcards are accepted. Empty to allow any domains"),
+ '$allowed_email' => array('allowed_email', t("Allowed email domains"), get_config('system','allowed_email'), "Comma separated list of domains which are allowed in email addresses for registrations to this site. Wildcards are accepted. Empty to allow any domains"),
+ '$block_public' => array('block_public', t("Block public"), get_config('system','block_public'), "Check to block public access to all otherwise public personal pages on this site unless you are currently logged in."),
+ '$force_publish' => array('publish_all', t("Force publish"), get_config('system','publish_all'), "Check to force all profiles on this site to be listed in the site directory."),
+ '$global_directory' => array('directory_submit_url', t("Global directory update URL"), get_config('system','directory_submit_url'), "URL to update the global directory. If this is not set, the global directory is completely unavailable to the application."),
+ '$global_search_url'=> array('directory_search_url', t("Global directory search URL"), get_config('system','directory_search_url'), ""),
+
+
+ '$no_multi_reg' => array('no_multi_reg', t("Block multiple registrations"), get_config('system','block_extended_register'), "Disallow users to register additional accounts for use as pages."),
+ '$no_openid' => array('no_openid', t("No OpenID support"), get_config('system','no_openid'), "Disable OpenID support for registration and logins."),
+ '$no_gravatar' => array('no_gravatar', t("No Gravatar support"), get_config('system','no_gravatar'), ""),
+ '$no_regfullname' => array('no_regfullname', t("No fullname check"), get_config('system','no_regfullname'), "If unchecked, force users to registrate with a space between his firsname and lastname in Full name, as an antispam measure"),
+ '$no_utf' => array('no_utf', t("No UTF-8 Regular expressions"), get_config('system','proxy'), "Default is false (meaning UTF8 regular expressions are supported and working)"),
+
+ '$rino_enc' => array('rino_enc', t("Enable Rino encrypt"), get_config('system','rino_encrypt'),""),
+ '$verifyssl' => array('verifyssl', t("Verify SSL"), get_config('system','verifyssl'), "If you wish, you can turn on strict certificate checking. This will mean you cannot connect (at all) to self-signed SSL sites."),
+ '$proxyuser' => array('proxyuser', t("Proxy user"), get_config('system','proxyuser'), ""),
+ '$proxy' => array('proxy', t("Proxy URL"), get_config('system','proxy'), ""),
+ '$timeout' => array('timeout', t("Network timeout"), (x(get_config('system','curl_timeout'))?get_config('system','curl_timeout'):60), "Value is in seconds. Set to 0 for unlimited (not recommended)."),
+
+
+ ));
+
+}
+
+
+/**
+ * Users admin page
+ */
+
+function admin_page_users(&$a){
+ return ":)";
+}
+
+
+/*
+ * Plugins admin page
+ */
+
+function admin_page_plugins(&$a){
+
+ /* all plugins */
+ $plugins = array();
+ $files = glob("addon/*/");
+ if($files) {
+ foreach($files as $file) {
+ if (is_dir($file)){
+ list($tmp, $id)=array_map("trim", explode("/",$file));
+ // TODO: plugins info
+ $name=$author=$description=$homepage="";
+ $plugins[] = array( $id, (in_array($id, $a->plugins)?"on":"off") , $name, $author, $description, $homepage);
+ }
+ }
+ }
+
+ $t = get_markup_template("admin_plugins.tpl");
+ return replace_macros($t, array(
+ '$title' => t('Administration'),
+ '$page' => t('Plugins'),
+ '$submit' => t('Submit'),
+ '$baseurl' => $a->get_baseurl(),
+
+ '$plugins' => $plugins
+ ));
+}
+
diff --git a/view/admin_aside.tpl b/view/admin_aside.tpl
new file mode 100644
index 000000000..dd81a6fee
--- /dev/null
+++ b/view/admin_aside.tpl
@@ -0,0 +1,20 @@
+<h4><a href="$admurl">Admin</a></h4>
+<ul>
+ <li class='admin link $admin.site.2'><a href='$admin.site.0'>$admin.site.1</a></li>
+ <li class='admin link $admin.users.2'><a href='$admin.users.0'>$admin.users.1</a></li>
+ <li class='admin link $admin.plugins.2'><a href='$admin.plugins.0'>$admin.plugins.1</a></li>
+</ul>
+
+
+{{ if $admin.plugins_admin }}<h4>Plugins</h4>{{ endif }}
+<ul>
+ {{ for $admin.plugins_admin as $l }}
+ <li class='admin link $l.2'><a href='$l.0'>$l.1</a></li>
+ {{ endfor }}
+</ul>
+
+
+<h4>Logs</h4>
+<ul>
+ <li class='admin link $admin.logs.2'><a href='$admin.logs.0'>$admin.logs.1</a></li>
+</ul>
diff --git a/view/admin_plugins.tpl b/view/admin_plugins.tpl
new file mode 100644
index 000000000..d29665a06
--- /dev/null
+++ b/view/admin_plugins.tpl
@@ -0,0 +1,14 @@
+<div id='adminpage'>
+ <h1>$title - $page</h1>
+
+ <ul id='pluginslist'>
+ {{ for $plugins as $p }}
+ <li class='plugin $p.1'>
+ <a class='toggle' href='$baseurl/admin/plugins/$p.0?a=t'><span class='icon $p.1'></span></a>
+ <a href='$baseurl/admin/plugins/$p.0'>
+ <span class='name'>$p.0</span>
+ </a>
+ </li>
+ {{ endfor }}
+ </ul>
+</div>
diff --git a/view/admin_site.tpl b/view/admin_site.tpl
new file mode 100644
index 000000000..f120461aa
--- /dev/null
+++ b/view/admin_site.tpl
@@ -0,0 +1,45 @@
+<div id='adminpage'>
+ <h1>$title - $page</h1>
+
+ <form action="$baseurl/admin/site" method="post">
+
+ {{ inc field_input.tpl with $field=$sitename }}{{ endinc }}
+ {{ inc field_textarea.tpl with $field=$banner }}{{ endinc }}
+ {{ inc field_select.tpl with $field=$language }}{{ endinc }}
+ {{ inc field_select.tpl with $field=$theme }}{{ endinc }}
+
+ <div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
+
+ <h3>Upload</h3>
+ {{ inc field_input.tpl with $field=$maximagesize }}{{ endinc }}
+
+ <h3>Corporate/Edu</h3>
+ {{ inc field_input.tpl with $field=$allowed_sites }}{{ endinc }}
+ {{ inc field_input.tpl with $field=$allowed_email }}{{ endinc }}
+ {{ inc field_checkbox.tpl with $field=$block_public }}{{ endinc }}
+ {{ inc field_checkbox.tpl with $field=$force_publish }}{{ endinc }}
+ {{ inc field_input.tpl with $field=$global_directory }}{{ endinc }}
+ {{ inc field_input.tpl with $field=$global_search_url }}{{ endinc }}
+
+ <div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
+
+ <h3>Registration</h3>
+ {{ inc field_checkbox.tpl with $field=$no_multi_reg }}{{ endinc }}
+ {{ inc field_checkbox.tpl with $field=$no_openid }}{{ endinc }}
+ {{ inc field_checkbox.tpl with $field=$no_gravatar }}{{ endinc }}
+ {{ inc field_checkbox.tpl with $field=$no_regfullname }}{{ endinc }}
+ {{ inc field_checkbox.tpl with $field=$no_utf }}{{ endinc }}
+
+ <div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
+
+ <h3>Advanced</h3>
+ {{ inc field_checkbox.tpl with $field=$rino_enc }}{{ endinc }}
+ {{ inc field_checkbox.tpl with $field=$verifyssl }}{{ endinc }}
+ {{ inc field_input.tpl with $field=$proxy }}{{ endinc }}
+ {{ inc field_input.tpl with $field=$proxyuser }}{{ endinc }}
+ {{ inc field_input.tpl with $field=$timeout }}{{ endinc }}
+
+ <div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
+
+ </form>
+</div>
diff --git a/view/admin_summary.tpl b/view/admin_summary.tpl
new file mode 100644
index 000000000..59428986a
--- /dev/null
+++ b/view/admin_summary.tpl
@@ -0,0 +1,36 @@
+<div id='adminpage'>
+ <h1>$title - $page</h1>
+
+ <dl>
+ <dt>$pending.0</dt>
+ <dd>$pending.1</dt>
+ </dl>
+
+ <dl>
+ <dt>$users.0</dt>
+ <dd>$users.1</dd>
+ </dl>
+ {{ for $accounts as $p }}
+ <dl>
+ <dt>$p.0</dt>
+ <dd>$p.1</dd>
+ </dl>
+ {{ endfor }}
+
+
+ <dl>
+ <dt>$plugins.0</dt>
+
+ {{ for $plugins.1 as $p }}
+ <dd>$p</dd>
+ {{ endfor }}
+
+ </dl>
+
+ <dl>
+ <dt>$version.0</dt>
+ <dd>$version.1 - $build</dt>
+ </dl>
+
+
+</div>
diff --git a/view/field.tpl b/view/field.tpl
new file mode 100644
index 000000000..35f5afd39
--- /dev/null
+++ b/view/field.tpl
@@ -0,0 +1,4 @@
+
+ {{ if $field.0==select }}
+ {{ inc field_select.tpl }}{{ endinc }}
+ {{ endif }}
diff --git a/view/field_checkbox.tpl b/view/field_checkbox.tpl
new file mode 100644
index 000000000..4a86da7ea
--- /dev/null
+++ b/view/field_checkbox.tpl
@@ -0,0 +1,6 @@
+
+ <div class='field checkbox'>
+ <label for='id_$field.0'>$field.1</label>
+ <input type="checkbox" name='$field.0' id='id_$field.0' {{ if $field.2 }}checked="true"{{ endif }}>
+ <span class='field_help'>$field.3</span>
+ </div>
diff --git a/view/field_input.tpl b/view/field_input.tpl
new file mode 100644
index 000000000..748d93f3e
--- /dev/null
+++ b/view/field_input.tpl
@@ -0,0 +1,6 @@
+
+ <div class='field input'>
+ <label for='id_$field.0'>$field.1</label>
+ <input name='$field.0' id='id_$field.0' value="$field.2">
+ <span class='field_help'>$field.3</span>
+ </div>
diff --git a/view/field_select.tpl b/view/field_select.tpl
new file mode 100644
index 000000000..d79eb48e0
--- /dev/null
+++ b/view/field_select.tpl
@@ -0,0 +1,8 @@
+
+ <div class='field select'>
+ <label for='id_$field.0'>$field.1</label>
+ <select name='$field.0' id='id_$field.0'>
+ {{ for $field.4 as $opt=>$val }}<option value="$opt" {{ if $opt==$field.2 }}selected="selected"{{ endif }}>$val</option>{{ endfor }}
+ </select>
+ <span class='field_help'>$field.3</span>
+ </div>
diff --git a/view/field_textarea.tpl b/view/field_textarea.tpl
new file mode 100644
index 000000000..2425cdd3b
--- /dev/null
+++ b/view/field_textarea.tpl
@@ -0,0 +1,6 @@
+
+ <div class='field textarea'>
+ <label for='id_$field.0'>$field.1</label>
+ <textarea name='$field.0' id='id_$field.0'>$field.2</textarea>
+ <span class='field_help'>$field.3</span>
+ </div>
diff --git a/view/it/strings.php b/view/it/strings.php
index 75459e23a..32092a3f1 100644
--- a/view/it/strings.php
+++ b/view/it/strings.php
@@ -123,7 +123,7 @@ $a->strings["Administrator"] = "Amministratore";
$a->strings["Friend/Connection Request"] = "Richieste di Amicizia/Connessione";
$a->strings["Examples: jojo@demo.friendika.com, http://demo.friendika.com/profile/jojo, testuser@identi.ca"] = "Esempi: jojo@demo.friendika.com, http://demo.friendika.com/profile/jojo, testuser@identi.ca";
$a->strings["Please answer the following:"] = "Rispondi al seguente:";
-$a->strings["Does \$name know you?"] = "$name ti conosce?";
+$a->strings["Does \$name know you?"] = "\$name ti conosce?";
$a->strings["Yes"] = "Si";
$a->strings["No"] = "No";
$a->strings["Add a personal note:"] = "Aggiungi una nota personale:";
diff --git a/view/nav.tpl b/view/nav.tpl
index 7e76811d9..79114749a 100644
--- a/view/nav.tpl
+++ b/view/nav.tpl
@@ -16,6 +16,8 @@ $langselector
<a id="nav-search-link" class="nav-link $nav.search.2" href="$nav.search.0">$nav.search.1</a>
<a id="nav-directory-link" class="nav-link $nav.directory.2" href="$nav.directory.0">$nav.directory.1</a>
+{{ if $nav.admin }}<a id="nav-admin-link" class="nav-link $nav.admin.2" href="$nav.admin.0">$nav.admin.1</a>{{ endif }}
+
{{ if $nav.network }}
<a id="nav-network-link" class="nav-commlink $nav.network.2" href="$nav.network.0">$nav.network.1</a>
<span id="net-update" class="nav-ajax-left"></span>
diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index 9555a1e96..563234238 100644
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -2482,6 +2482,73 @@ a.mail-list-link {
filter:alpha(opacity=100);
}
+/**
+ * ADMIN
+ */
+
+#adminpage dl {
+ clear: left;
+ margin-bottom: 2px;
+ padding-bottom: 2px;
+ border-bottom: 1px solid black;
+}
+#adminpage dt {
+ width: 200px;
+ float: left;
+ font-weight: bold;
+}
+#adminpage dd {
+ margin-left: 200px;
+}
+
+#adminpage .field {
+ clear: left;
+ margin-bottom: 5px;
+ padding-bottom: 5px;
+}
+
+#adminpage .field label {
+ float: left;
+ width: 200px;
+ font-weight: bold;
+}
+
+#adminpage .field input,
+#adminpage .field textarea {
+ width: 400px;
+}
+#adminpage .field textarea { height: 100px; }
+#adminpage .field_help {
+ display: block;
+ margin-left: 200px;
+ color: #666666;
+
+}
+
+#adminpage h3 {
+ border-bottom: 1px solid #cccccc;
+}
+
+#adminpage .submit {
+ clear:left;
+ text-align: right;
+}
+
+#adminpage #pluginslist {
+ margin: 0px; padding: 0px;
+}
+#adminpage .plugin {
+ list-style: none;
+ display: block;
+ border: 1px solid #888888;
+ padding: 1em;
+ margin-bottom: 5px;
+ clear: left;
+}
+#adminpage .plugin .toggle {
+ float:left;
+ margin-right: 1em;
+}
/**
* ICONS
@@ -2521,7 +2588,9 @@ a.mail-list-link {
.language { background-position: -96px -32px; }
.prev { background-position: -112px -32px; }
.next { background-position: -128px -32px; }
+.on { background-position: -144px -32px; }
+.off { background-position: 0px -48px; }
.attachtype {
display: block; width: 20px; height: 23px;