aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/text.php4
-rw-r--r--index.php7
-rw-r--r--view/theme/clean/nav.tpl51
-rw-r--r--view/theme/clean/theme.php4
-rw-r--r--view/theme/darkness/nav.tpl51
-rw-r--r--view/theme/darkness/theme.php4
-rw-r--r--view/theme/darkzero/nav.tpl51
-rw-r--r--view/theme/darkzero/theme.php4
-rw-r--r--view/theme/duepuntozero/profile_vcard.tpl47
-rw-r--r--view/theme/duepuntozero/theme.php2
-rw-r--r--view/theme/easterbunny/nav.tpl51
-rw-r--r--view/theme/easterbunny/theme.php4
-rw-r--r--view/theme/goldenrod/nav.tpl51
-rw-r--r--view/theme/goldenrod/theme.php4
-rw-r--r--view/theme/greenzero/nav.tpl51
-rw-r--r--view/theme/greenzero/theme.php4
-rw-r--r--view/theme/loozah/profile_vcard.tpl47
-rw-r--r--view/theme/purplezero/nav.tpl51
-rw-r--r--view/theme/purplezero/theme.php4
-rw-r--r--view/theme/shady/nav.tpl51
-rw-r--r--view/theme/shady/theme.php4
-rw-r--r--view/theme/three-d/nav.tpl51
-rw-r--r--view/theme/three-d/theme.php4
23 files changed, 142 insertions, 460 deletions
diff --git a/include/text.php b/include/text.php
index ea64a3d28..656cd8809 100644
--- a/include/text.php
+++ b/include/text.php
@@ -388,11 +388,13 @@ function get_intltext_template($s) {
if(! function_exists('get_markup_template')) {
function get_markup_template($s) {
-
+ $a=get_app();
$theme = current_theme();
if(file_exists("view/theme/$theme/$s"))
return file_get_contents("view/theme/$theme/$s");
+ elseif (x($a->theme_info,"extends") && file_exists("view/theme/".$a->theme_info["extends"]."/$s"))
+ return file_get_contents("view/theme/".$a->theme_info["extends"]."/$s");
else
return file_get_contents("view/$s");
diff --git a/index.php b/index.php
index 98733c4c8..25fdb4f8c 100644
--- a/index.php
+++ b/index.php
@@ -218,6 +218,13 @@ if(strlen($a->module)) {
}
}
+/**
+ * load current theme info
+ */
+$theme_info_file = "view/theme/".current_theme()."/theme.php";
+if (file_exists($theme_info_file)){
+ require_once($theme_info_file);
+}
/* initialise content region */
diff --git a/view/theme/clean/nav.tpl b/view/theme/clean/nav.tpl
deleted file mode 100644
index 2cd29a7c2..000000000
--- a/view/theme/clean/nav.tpl
+++ /dev/null
@@ -1,51 +0,0 @@
-<nav>
- $langselector
-
- <div id="site-location">$sitelocation</div>
-
- {{ if $nav.logout }}<a id="nav-logout-link" class="nav-link $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a> {{ endif }}
- {{ if $nav.login }}<a id="nav-login-link" class="nav-login-link $nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a> {{ endif }}
-
- <span id="nav-link-wrapper" >
-
- {{ if $nav.register }}<a id="nav-register-link" class="nav-commlink $nav.register.2" href="$nav.register.0" title="$nav.register.3" >$nav.register.1</a>{{ endif }}
-
- <a id="nav-help-link" class="nav-link $nav.help.2" target="friendika-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a>
-
- {{ if $nav.apps }}<a id="nav-apps-link" class="nav-link $nav.apps.2" href="$nav.apps.0" title="$nav.apps.3" >$nav.apps.1</a>{{ endif }}
-
- <a id="nav-search-link" class="nav-link $nav.search.2" href="$nav.search.0" title="$nav.search.3" >$nav.search.1</a>
- <a id="nav-directory-link" class="nav-link $nav.directory.2" href="$nav.directory.0" title="$nav.directory.3" >$nav.directory.1</a>
-
- {{ if $nav.admin }}<a id="nav-admin-link" class="nav-link $nav.admin.2" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a>{{ endif }}
-
- {{ if $nav.network }}
- <a id="nav-network-link" class="nav-commlink $nav.network.2" href="$nav.network.0" title="$nav.network.3" >$nav.network.1</a>
- <span id="net-update" class="nav-ajax-left"></span>
- {{ endif }}
- {{ if $nav.home }}
- <a id="nav-home-link" class="nav-commlink $nav.home.2" href="$nav.home.0" title="$nav.home.3" >$nav.home.1</a>
- <span id="home-update" class="nav-ajax-left"></span>
- {{ endif }}
- {{ if $nav.community }}
- <a id="nav-community-link" class="nav-commlink $nav.community.2" href="$nav.community.0" title="$nav.community.3" >$nav.community.1</a>
- {{ endif }}
- {{ if $nav.notifications }}
- <a id="nav-notify-link" class="nav-commlink $nav.notifications.2" href="$nav.notifications.0" title="$nav.notifications.3" >$nav.notifications.1</a>
- <span id="notify-update" class="nav-ajax-left"></span>
- {{ endif }}
- {{ if $nav.messages }}
- <a id="nav-messages-link" class="nav-commlink $nav.messages.2" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a>
- <span id="mail-update" class="nav-ajax-left"></span>
- {{ endif }}
-
- {{ if $nav.manage }}<a id="nav-manage-link" class="nav-commlink $nav.manage.2" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a>{{ endif }}
-
- {{ if $nav.settings }}<a id="nav-settings-link" class="nav-link $nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a>{{ endif }}
- {{ if $nav.profiles }}<a id="nav-profiles-link" class="nav-link $nav.profiles.2" href="$nav.profiles.0" title="$nav.profiles.3" >$nav.profiles.1</a>{{ endif }}
-
- {{ if $nav.contacts }}<a id="nav-contacts-link" class="nav-link $nav.contacts.2" href="$nav.contacts.0" title="$nav.contacts.3" >$nav.contacts.1</a>{{ endif }}
- </span>
- <span id="nav-end"></span>
- <span id="banner">$banner</span>
-</nav>
diff --git a/view/theme/clean/theme.php b/view/theme/clean/theme.php
new file mode 100644
index 000000000..47b43cf13
--- /dev/null
+++ b/view/theme/clean/theme.php
@@ -0,0 +1,4 @@
+<?php
+$a->theme_info = array(
+ 'extends' => 'loozah',
+);
diff --git a/view/theme/darkness/nav.tpl b/view/theme/darkness/nav.tpl
deleted file mode 100644
index 2cd29a7c2..000000000
--- a/view/theme/darkness/nav.tpl
+++ /dev/null
@@ -1,51 +0,0 @@
-<nav>
- $langselector
-
- <div id="site-location">$sitelocation</div>
-
- {{ if $nav.logout }}<a id="nav-logout-link" class="nav-link $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a> {{ endif }}
- {{ if $nav.login }}<a id="nav-login-link" class="nav-login-link $nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a> {{ endif }}
-
- <span id="nav-link-wrapper" >
-
- {{ if $nav.register }}<a id="nav-register-link" class="nav-commlink $nav.register.2" href="$nav.register.0" title="$nav.register.3" >$nav.register.1</a>{{ endif }}
-
- <a id="nav-help-link" class="nav-link $nav.help.2" target="friendika-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a>
-
- {{ if $nav.apps }}<a id="nav-apps-link" class="nav-link $nav.apps.2" href="$nav.apps.0" title="$nav.apps.3" >$nav.apps.1</a>{{ endif }}
-
- <a id="nav-search-link" class="nav-link $nav.search.2" href="$nav.search.0" title="$nav.search.3" >$nav.search.1</a>
- <a id="nav-directory-link" class="nav-link $nav.directory.2" href="$nav.directory.0" title="$nav.directory.3" >$nav.directory.1</a>
-
- {{ if $nav.admin }}<a id="nav-admin-link" class="nav-link $nav.admin.2" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a>{{ endif }}
-
- {{ if $nav.network }}
- <a id="nav-network-link" class="nav-commlink $nav.network.2" href="$nav.network.0" title="$nav.network.3" >$nav.network.1</a>
- <span id="net-update" class="nav-ajax-left"></span>
- {{ endif }}
- {{ if $nav.home }}
- <a id="nav-home-link" class="nav-commlink $nav.home.2" href="$nav.home.0" title="$nav.home.3" >$nav.home.1</a>
- <span id="home-update" class="nav-ajax-left"></span>
- {{ endif }}
- {{ if $nav.community }}
- <a id="nav-community-link" class="nav-commlink $nav.community.2" href="$nav.community.0" title="$nav.community.3" >$nav.community.1</a>
- {{ endif }}
- {{ if $nav.notifications }}
- <a id="nav-notify-link" class="nav-commlink $nav.notifications.2" href="$nav.notifications.0" title="$nav.notifications.3" >$nav.notifications.1</a>
- <span id="notify-update" class="nav-ajax-left"></span>
- {{ endif }}
- {{ if $nav.messages }}
- <a id="nav-messages-link" class="nav-commlink $nav.messages.2" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a>
- <span id="mail-update" class="nav-ajax-left"></span>
- {{ endif }}
-
- {{ if $nav.manage }}<a id="nav-manage-link" class="nav-commlink $nav.manage.2" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a>{{ endif }}
-
- {{ if $nav.settings }}<a id="nav-settings-link" class="nav-link $nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a>{{ endif }}
- {{ if $nav.profiles }}<a id="nav-profiles-link" class="nav-link $nav.profiles.2" href="$nav.profiles.0" title="$nav.profiles.3" >$nav.profiles.1</a>{{ endif }}
-
- {{ if $nav.contacts }}<a id="nav-contacts-link" class="nav-link $nav.contacts.2" href="$nav.contacts.0" title="$nav.contacts.3" >$nav.contacts.1</a>{{ endif }}
- </span>
- <span id="nav-end"></span>
- <span id="banner">$banner</span>
-</nav>
diff --git a/view/theme/darkness/theme.php b/view/theme/darkness/theme.php
new file mode 100644
index 000000000..47b43cf13
--- /dev/null
+++ b/view/theme/darkness/theme.php
@@ -0,0 +1,4 @@
+<?php
+$a->theme_info = array(
+ 'extends' => 'loozah',
+);
diff --git a/view/theme/darkzero/nav.tpl b/view/theme/darkzero/nav.tpl
deleted file mode 100644
index 2cd29a7c2..000000000
--- a/view/theme/darkzero/nav.tpl
+++ /dev/null
@@ -1,51 +0,0 @@
-<nav>
- $langselector
-
- <div id="site-location">$sitelocation</div>
-
- {{ if $nav.logout }}<a id="nav-logout-link" class="nav-link $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a> {{ endif }}
- {{ if $nav.login }}<a id="nav-login-link" class="nav-login-link $nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a> {{ endif }}
-
- <span id="nav-link-wrapper" >
-
- {{ if $nav.register }}<a id="nav-register-link" class="nav-commlink $nav.register.2" href="$nav.register.0" title="$nav.register.3" >$nav.register.1</a>{{ endif }}
-
- <a id="nav-help-link" class="nav-link $nav.help.2" target="friendika-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a>
-
- {{ if $nav.apps }}<a id="nav-apps-link" class="nav-link $nav.apps.2" href="$nav.apps.0" title="$nav.apps.3" >$nav.apps.1</a>{{ endif }}
-
- <a id="nav-search-link" class="nav-link $nav.search.2" href="$nav.search.0" title="$nav.search.3" >$nav.search.1</a>
- <a id="nav-directory-link" class="nav-link $nav.directory.2" href="$nav.directory.0" title="$nav.directory.3" >$nav.directory.1</a>
-
- {{ if $nav.admin }}<a id="nav-admin-link" class="nav-link $nav.admin.2" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a>{{ endif }}
-
- {{ if $nav.network }}
- <a id="nav-network-link" class="nav-commlink $nav.network.2" href="$nav.network.0" title="$nav.network.3" >$nav.network.1</a>
- <span id="net-update" class="nav-ajax-left"></span>
- {{ endif }}
- {{ if $nav.home }}
- <a id="nav-home-link" class="nav-commlink $nav.home.2" href="$nav.home.0" title="$nav.home.3" >$nav.home.1</a>
- <span id="home-update" class="nav-ajax-left"></span>
- {{ endif }}
- {{ if $nav.community }}
- <a id="nav-community-link" class="nav-commlink $nav.community.2" href="$nav.community.0" title="$nav.community.3" >$nav.community.1</a>
- {{ endif }}
- {{ if $nav.notifications }}
- <a id="nav-notify-link" class="nav-commlink $nav.notifications.2" href="$nav.notifications.0" title="$nav.notifications.3" >$nav.notifications.1</a>
- <span id="notify-update" class="nav-ajax-left"></span>
- {{ endif }}
- {{ if $nav.messages }}
- <a id="nav-messages-link" class="nav-commlink $nav.messages.2" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a>
- <span id="mail-update" class="nav-ajax-left"></span>
- {{ endif }}
-
- {{ if $nav.manage }}<a id="nav-manage-link" class="nav-commlink $nav.manage.2" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a>{{ endif }}
-
- {{ if $nav.settings }}<a id="nav-settings-link" class="nav-link $nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a>{{ endif }}
- {{ if $nav.profiles }}<a id="nav-profiles-link" class="nav-link $nav.profiles.2" href="$nav.profiles.0" title="$nav.profiles.3" >$nav.profiles.1</a>{{ endif }}
-
- {{ if $nav.contacts }}<a id="nav-contacts-link" class="nav-link $nav.contacts.2" href="$nav.contacts.0" title="$nav.contacts.3" >$nav.contacts.1</a>{{ endif }}
- </span>
- <span id="nav-end"></span>
- <span id="banner">$banner</span>
-</nav>
diff --git a/view/theme/darkzero/theme.php b/view/theme/darkzero/theme.php
new file mode 100644
index 000000000..338f40cbf
--- /dev/null
+++ b/view/theme/darkzero/theme.php
@@ -0,0 +1,4 @@
+<?php
+$a->theme_info = array(
+ 'extends' => 'duepuntozero',
+);
diff --git a/view/theme/duepuntozero/profile_vcard.tpl b/view/theme/duepuntozero/profile_vcard.tpl
new file mode 100644
index 000000000..b3f5cc50d
--- /dev/null
+++ b/view/theme/duepuntozero/profile_vcard.tpl
@@ -0,0 +1,47 @@
+<div class="vcard">
+
+ <div class="fn label">$profile.name</div>
+
+
+
+ {{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
+ <div id="profile-photo-wrapper"><img class="photo" width="175" height="175" src="$profile.photo" alt="$profile.name"></div>
+
+
+
+ {{ if $location }}
+ <dl class="location"><dt class="location-label">$location</dt>
+ <dd class="adr">
+ {{ if $profile.address }}<div class="street-address">$profile.address</div>{{ endif }}
+ <span class="city-state-zip">
+ <span class="locality">$profile.locality</span>{{ if $profile.locality }}, {{ endif }}
+ <span class="region">$profile.region</span>
+ <span class="postal-code">$profile.postal-code</span>
+ </span>
+ {{ if $profile.country-name }}<span class="country-name">$profile.country-name</span>{{ endif }}
+ </dd>
+ </dl>
+ {{ endif }}
+
+ {{ if $gender }}<dl class="mf"><dt class="gender-label">$gender</dt> <dd class="x-gender">$profile.gender</dd></dl>{{ endif }}
+
+ {{ if $profile.pubkey }}<div class="key" style="display:none;">$profile.pubkey</div>{{ endif }}
+
+ {{ if $marital }}<dl class="marital"><dt class="marital-label"><span class="heart">&hearts;</span>$marital</dt><dd class="marital-text">$profile.marital</dd></dl>{{ endif }}
+
+ {{ if $homepage }}<dl class="homepage"><dt class="homepage-label">$homepage</dt><dd class="homepage-url"><a href="$profile.homepage" target="external-link">$profile.homepage</a></dd></dl>{{ endif }}
+
+ {{ inc diaspora_vcard.tpl }}{{ endinc }}
+
+ <div id="profile-extra-links">
+ <ul>
+ {{ if $connect }}
+ <li><a id="dfrn-request-link" href="dfrn_request/$profile.nickname">$connect</a></li>
+ {{ endif }}
+ </ul>
+ </div>
+</div>
+
+$contact_block
+
+
diff --git a/view/theme/duepuntozero/theme.php b/view/theme/duepuntozero/theme.php
new file mode 100644
index 000000000..ebced7b9b
--- /dev/null
+++ b/view/theme/duepuntozero/theme.php
@@ -0,0 +1,2 @@
+<?php
+$a->theme_info = array();
diff --git a/view/theme/easterbunny/nav.tpl b/view/theme/easterbunny/nav.tpl
deleted file mode 100644
index 2cd29a7c2..000000000
--- a/view/theme/easterbunny/nav.tpl
+++ /dev/null
@@ -1,51 +0,0 @@
-<nav>
- $langselector
-
- <div id="site-location">$sitelocation</div>
-
- {{ if $nav.logout }}<a id="nav-logout-link" class="nav-link $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a> {{ endif }}
- {{ if $nav.login }}<a id="nav-login-link" class="nav-login-link $nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a> {{ endif }}
-
- <span id="nav-link-wrapper" >
-
- {{ if $nav.register }}<a id="nav-register-link" class="nav-commlink $nav.register.2" href="$nav.register.0" title="$nav.register.3" >$nav.register.1</a>{{ endif }}
-
- <a id="nav-help-link" class="nav-link $nav.help.2" target="friendika-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a>
-
- {{ if $nav.apps }}<a id="nav-apps-link" class="nav-link $nav.apps.2" href="$nav.apps.0" title="$nav.apps.3" >$nav.apps.1</a>{{ endif }}
-
- <a id="nav-search-link" class="nav-link $nav.search.2" href="$nav.search.0" title="$nav.search.3" >$nav.search.1</a>
- <a id="nav-directory-link" class="nav-link $nav.directory.2" href="$nav.directory.0" title="$nav.directory.3" >$nav.directory.1</a>
-
- {{ if $nav.admin }}<a id="nav-admin-link" class="nav-link $nav.admin.2" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a>{{ endif }}
-
- {{ if $nav.network }}
- <a id="nav-network-link" class="nav-commlink $nav.network.2" href="$nav.network.0" title="$nav.network.3" >$nav.network.1</a>
- <span id="net-update" class="nav-ajax-left"></span>
- {{ endif }}
- {{ if $nav.home }}
- <a id="nav-home-link" class="nav-commlink $nav.home.2" href="$nav.home.0" title="$nav.home.3" >$nav.home.1</a>
- <span id="home-update" class="nav-ajax-left"></span>
- {{ endif }}
- {{ if $nav.community }}
- <a id="nav-community-link" class="nav-commlink $nav.community.2" href="$nav.community.0" title="$nav.community.3" >$nav.community.1</a>
- {{ endif }}
- {{ if $nav.notifications }}
- <a id="nav-notify-link" class="nav-commlink $nav.notifications.2" href="$nav.notifications.0" title="$nav.notifications.3" >$nav.notifications.1</a>
- <span id="notify-update" class="nav-ajax-left"></span>
- {{ endif }}
- {{ if $nav.messages }}
- <a id="nav-messages-link" class="nav-commlink $nav.messages.2" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a>
- <span id="mail-update" class="nav-ajax-left"></span>
- {{ endif }}
-
- {{ if $nav.manage }}<a id="nav-manage-link" class="nav-commlink $nav.manage.2" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a>{{ endif }}
-
- {{ if $nav.settings }}<a id="nav-settings-link" class="nav-link $nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a>{{ endif }}
- {{ if $nav.profiles }}<a id="nav-profiles-link" class="nav-link $nav.profiles.2" href="$nav.profiles.0" title="$nav.profiles.3" >$nav.profiles.1</a>{{ endif }}
-
- {{ if $nav.contacts }}<a id="nav-contacts-link" class="nav-link $nav.contacts.2" href="$nav.contacts.0" title="$nav.contacts.3" >$nav.contacts.1</a>{{ endif }}
- </span>
- <span id="nav-end"></span>
- <span id="banner">$banner</span>
-</nav>
diff --git a/view/theme/easterbunny/theme.php b/view/theme/easterbunny/theme.php
new file mode 100644
index 000000000..47b43cf13
--- /dev/null
+++ b/view/theme/easterbunny/theme.php
@@ -0,0 +1,4 @@
+<?php
+$a->theme_info = array(
+ 'extends' => 'loozah',
+);
diff --git a/view/theme/goldenrod/nav.tpl b/view/theme/goldenrod/nav.tpl
deleted file mode 100644
index 2cd29a7c2..000000000
--- a/view/theme/goldenrod/nav.tpl
+++ /dev/null
@@ -1,51 +0,0 @@
-<nav>
- $langselector
-
- <div id="site-location">$sitelocation</div>
-
- {{ if $nav.logout }}<a id="nav-logout-link" class="nav-link $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a> {{ endif }}
- {{ if $nav.login }}<a id="nav-login-link" class="nav-login-link $nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a> {{ endif }}
-
- <span id="nav-link-wrapper" >
-
- {{ if $nav.register }}<a id="nav-register-link" class="nav-commlink $nav.register.2" href="$nav.register.0" title="$nav.register.3" >$nav.register.1</a>{{ endif }}
-
- <a id="nav-help-link" class="nav-link $nav.help.2" target="friendika-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a>
-
- {{ if $nav.apps }}<a id="nav-apps-link" class="nav-link $nav.apps.2" href="$nav.apps.0" title="$nav.apps.3" >$nav.apps.1</a>{{ endif }}
-
- <a id="nav-search-link" class="nav-link $nav.search.2" href="$nav.search.0" title="$nav.search.3" >$nav.search.1</a>
- <a id="nav-directory-link" class="nav-link $nav.directory.2" href="$nav.directory.0" title="$nav.directory.3" >$nav.directory.1</a>
-
- {{ if $nav.admin }}<a id="nav-admin-link" class="nav-link $nav.admin.2" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a>{{ endif }}
-
- {{ if $nav.network }}
- <a id="nav-network-link" class="nav-commlink $nav.network.2" href="$nav.network.0" title="$nav.network.3" >$nav.network.1</a>
- <span id="net-update" class="nav-ajax-left"></span>
- {{ endif }}
- {{ if $nav.home }}
- <a id="nav-home-link" class="nav-commlink $nav.home.2" href="$nav.home.0" title="$nav.home.3" >$nav.home.1</a>
- <span id="home-update" class="nav-ajax-left"></span>
- {{ endif }}
- {{ if $nav.community }}
- <a id="nav-community-link" class="nav-commlink $nav.community.2" href="$nav.community.0" title="$nav.community.3" >$nav.community.1</a>
- {{ endif }}
- {{ if $nav.notifications }}
- <a id="nav-notify-link" class="nav-commlink $nav.notifications.2" href="$nav.notifications.0" title="$nav.notifications.3" >$nav.notifications.1</a>
- <span id="notify-update" class="nav-ajax-left"></span>
- {{ endif }}
- {{ if $nav.messages }}
- <a id="nav-messages-link" class="nav-commlink $nav.messages.2" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a>
- <span id="mail-update" class="nav-ajax-left"></span>
- {{ endif }}
-
- {{ if $nav.manage }}<a id="nav-manage-link" class="nav-commlink $nav.manage.2" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a>{{ endif }}
-
- {{ if $nav.settings }}<a id="nav-settings-link" class="nav-link $nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a>{{ endif }}
- {{ if $nav.profiles }}<a id="nav-profiles-link" class="nav-link $nav.profiles.2" href="$nav.profiles.0" title="$nav.profiles.3" >$nav.profiles.1</a>{{ endif }}
-
- {{ if $nav.contacts }}<a id="nav-contacts-link" class="nav-link $nav.contacts.2" href="$nav.contacts.0" title="$nav.contacts.3" >$nav.contacts.1</a>{{ endif }}
- </span>
- <span id="nav-end"></span>
- <span id="banner">$banner</span>
-</nav>
diff --git a/view/theme/goldenrod/theme.php b/view/theme/goldenrod/theme.php
new file mode 100644
index 000000000..47b43cf13
--- /dev/null
+++ b/view/theme/goldenrod/theme.php
@@ -0,0 +1,4 @@
+<?php
+$a->theme_info = array(
+ 'extends' => 'loozah',
+);
diff --git a/view/theme/greenzero/nav.tpl b/view/theme/greenzero/nav.tpl
deleted file mode 100644
index 2cd29a7c2..000000000
--- a/view/theme/greenzero/nav.tpl
+++ /dev/null
@@ -1,51 +0,0 @@
-<nav>
- $langselector
-
- <div id="site-location">$sitelocation</div>
-
- {{ if $nav.logout }}<a id="nav-logout-link" class="nav-link $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a> {{ endif }}
- {{ if $nav.login }}<a id="nav-login-link" class="nav-login-link $nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a> {{ endif }}
-
- <span id="nav-link-wrapper" >
-
- {{ if $nav.register }}<a id="nav-register-link" class="nav-commlink $nav.register.2" href="$nav.register.0" title="$nav.register.3" >$nav.register.1</a>{{ endif }}
-
- <a id="nav-help-link" class="nav-link $nav.help.2" target="friendika-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a>
-
- {{ if $nav.apps }}<a id="nav-apps-link" class="nav-link $nav.apps.2" href="$nav.apps.0" title="$nav.apps.3" >$nav.apps.1</a>{{ endif }}
-
- <a id="nav-search-link" class="nav-link $nav.search.2" href="$nav.search.0" title="$nav.search.3" >$nav.search.1</a>
- <a id="nav-directory-link" class="nav-link $nav.directory.2" href="$nav.directory.0" title="$nav.directory.3" >$nav.directory.1</a>
-
- {{ if $nav.admin }}<a id="nav-admin-link" class="nav-link $nav.admin.2" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a>{{ endif }}
-
- {{ if $nav.network }}
- <a id="nav-network-link" class="nav-commlink $nav.network.2" href="$nav.network.0" title="$nav.network.3" >$nav.network.1</a>
- <span id="net-update" class="nav-ajax-left"></span>
- {{ endif }}
- {{ if $nav.home }}
- <a id="nav-home-link" class="nav-commlink $nav.home.2" href="$nav.home.0" title="$nav.home.3" >$nav.home.1</a>
- <span id="home-update" class="nav-ajax-left"></span>
- {{ endif }}
- {{ if $nav.community }}
- <a id="nav-community-link" class="nav-commlink $nav.community.2" href="$nav.community.0" title="$nav.community.3" >$nav.community.1</a>
- {{ endif }}
- {{ if $nav.notifications }}
- <a id="nav-notify-link" class="nav-commlink $nav.notifications.2" href="$nav.notifications.0" title="$nav.notifications.3" >$nav.notifications.1</a>
- <span id="notify-update" class="nav-ajax-left"></span>
- {{ endif }}
- {{ if $nav.messages }}
- <a id="nav-messages-link" class="nav-commlink $nav.messages.2" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a>
- <span id="mail-update" class="nav-ajax-left"></span>
- {{ endif }}
-
- {{ if $nav.manage }}<a id="nav-manage-link" class="nav-commlink $nav.manage.2" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a>{{ endif }}
-
- {{ if $nav.settings }}<a id="nav-settings-link" class="nav-link $nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a>{{ endif }}
- {{ if $nav.profiles }}<a id="nav-profiles-link" class="nav-link $nav.profiles.2" href="$nav.profiles.0" title="$nav.profiles.3" >$nav.profiles.1</a>{{ endif }}
-
- {{ if $nav.contacts }}<a id="nav-contacts-link" class="nav-link $nav.contacts.2" href="$nav.contacts.0" title="$nav.contacts.3" >$nav.contacts.1</a>{{ endif }}
- </span>
- <span id="nav-end"></span>
- <span id="banner">$banner</span>
-</nav>
diff --git a/view/theme/greenzero/theme.php b/view/theme/greenzero/theme.php
new file mode 100644
index 000000000..338f40cbf
--- /dev/null
+++ b/view/theme/greenzero/theme.php
@@ -0,0 +1,4 @@
+<?php
+$a->theme_info = array(
+ 'extends' => 'duepuntozero',
+);
diff --git a/view/theme/loozah/profile_vcard.tpl b/view/theme/loozah/profile_vcard.tpl
new file mode 100644
index 000000000..b3f5cc50d
--- /dev/null
+++ b/view/theme/loozah/profile_vcard.tpl
@@ -0,0 +1,47 @@
+<div class="vcard">
+
+ <div class="fn label">$profile.name</div>
+
+
+
+ {{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
+ <div id="profile-photo-wrapper"><img class="photo" width="175" height="175" src="$profile.photo" alt="$profile.name"></div>
+
+
+
+ {{ if $location }}
+ <dl class="location"><dt class="location-label">$location</dt>
+ <dd class="adr">
+ {{ if $profile.address }}<div class="street-address">$profile.address</div>{{ endif }}
+ <span class="city-state-zip">
+ <span class="locality">$profile.locality</span>{{ if $profile.locality }}, {{ endif }}
+ <span class="region">$profile.region</span>
+ <span class="postal-code">$profile.postal-code</span>
+ </span>
+ {{ if $profile.country-name }}<span class="country-name">$profile.country-name</span>{{ endif }}
+ </dd>
+ </dl>
+ {{ endif }}
+
+ {{ if $gender }}<dl class="mf"><dt class="gender-label">$gender</dt> <dd class="x-gender">$profile.gender</dd></dl>{{ endif }}
+
+ {{ if $profile.pubkey }}<div class="key" style="display:none;">$profile.pubkey</div>{{ endif }}
+
+ {{ if $marital }}<dl class="marital"><dt class="marital-label"><span class="heart">&hearts;</span>$marital</dt><dd class="marital-text">$profile.marital</dd></dl>{{ endif }}
+
+ {{ if $homepage }}<dl class="homepage"><dt class="homepage-label">$homepage</dt><dd class="homepage-url"><a href="$profile.homepage" target="external-link">$profile.homepage</a></dd></dl>{{ endif }}
+
+ {{ inc diaspora_vcard.tpl }}{{ endinc }}
+
+ <div id="profile-extra-links">
+ <ul>
+ {{ if $connect }}
+ <li><a id="dfrn-request-link" href="dfrn_request/$profile.nickname">$connect</a></li>
+ {{ endif }}
+ </ul>
+ </div>
+</div>
+
+$contact_block
+
+
diff --git a/view/theme/purplezero/nav.tpl b/view/theme/purplezero/nav.tpl
deleted file mode 100644
index 2cd29a7c2..000000000
--- a/view/theme/purplezero/nav.tpl
+++ /dev/null
@@ -1,51 +0,0 @@
-<nav>
- $langselector
-
- <div id="site-location">$sitelocation</div>
-
- {{ if $nav.logout }}<a id="nav-logout-link" class="nav-link $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a> {{ endif }}
- {{ if $nav.login }}<a id="nav-login-link" class="nav-login-link $nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a> {{ endif }}
-
- <span id="nav-link-wrapper" >
-
- {{ if $nav.register }}<a id="nav-register-link" class="nav-commlink $nav.register.2" href="$nav.register.0" title="$nav.register.3" >$nav.register.1</a>{{ endif }}
-
- <a id="nav-help-link" class="nav-link $nav.help.2" target="friendika-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a>
-
- {{ if $nav.apps }}<a id="nav-apps-link" class="nav-link $nav.apps.2" href="$nav.apps.0" title="$nav.apps.3" >$nav.apps.1</a>{{ endif }}
-
- <a id="nav-search-link" class="nav-link $nav.search.2" href="$nav.search.0" title="$nav.search.3" >$nav.search.1</a>
- <a id="nav-directory-link" class="nav-link $nav.directory.2" href="$nav.directory.0" title="$nav.directory.3" >$nav.directory.1</a>
-
- {{ if $nav.admin }}<a id="nav-admin-link" class="nav-link $nav.admin.2" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a>{{ endif }}
-
- {{ if $nav.network }}
- <a id="nav-network-link" class="nav-commlink $nav.network.2" href="$nav.network.0" title="$nav.network.3" >$nav.network.1</a>
- <span id="net-update" class="nav-ajax-left"></span>
- {{ endif }}
- {{ if $nav.home }}
- <a id="nav-home-link" class="nav-commlink $nav.home.2" href="$nav.home.0" title="$nav.home.3" >$nav.home.1</a>
- <span id="home-update" class="nav-ajax-left"></span>
- {{ endif }}
- {{ if $nav.community }}
- <a id="nav-community-link" class="nav-commlink $nav.community.2" href="$nav.community.0" title="$nav.community.3" >$nav.community.1</a>
- {{ endif }}
- {{ if $nav.notifications }}
- <a id="nav-notify-link" class="nav-commlink $nav.notifications.2" href="$nav.notifications.0" title="$nav.notifications.3" >$nav.notifications.1</a>
- <span id="notify-update" class="nav-ajax-left"></span>
- {{ endif }}
- {{ if $nav.messages }}
- <a id="nav-messages-link" class="nav-commlink $nav.messages.2" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a>
- <span id="mail-update" class="nav-ajax-left"></span>
- {{ endif }}
-
- {{ if $nav.manage }}<a id="nav-manage-link" class="nav-commlink $nav.manage.2" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a>{{ endif }}
-
- {{ if $nav.settings }}<a id="nav-settings-link" class="nav-link $nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a>{{ endif }}
- {{ if $nav.profiles }}<a id="nav-profiles-link" class="nav-link $nav.profiles.2" href="$nav.profiles.0" title="$nav.profiles.3" >$nav.profiles.1</a>{{ endif }}
-
- {{ if $nav.contacts }}<a id="nav-contacts-link" class="nav-link $nav.contacts.2" href="$nav.contacts.0" title="$nav.contacts.3" >$nav.contacts.1</a>{{ endif }}
- </span>
- <span id="nav-end"></span>
- <span id="banner">$banner</span>
-</nav>
diff --git a/view/theme/purplezero/theme.php b/view/theme/purplezero/theme.php
new file mode 100644
index 000000000..338f40cbf
--- /dev/null
+++ b/view/theme/purplezero/theme.php
@@ -0,0 +1,4 @@
+<?php
+$a->theme_info = array(
+ 'extends' => 'duepuntozero',
+);
diff --git a/view/theme/shady/nav.tpl b/view/theme/shady/nav.tpl
deleted file mode 100644
index 2cd29a7c2..000000000
--- a/view/theme/shady/nav.tpl
+++ /dev/null
@@ -1,51 +0,0 @@
-<nav>
- $langselector
-
- <div id="site-location">$sitelocation</div>
-
- {{ if $nav.logout }}<a id="nav-logout-link" class="nav-link $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a> {{ endif }}
- {{ if $nav.login }}<a id="nav-login-link" class="nav-login-link $nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a> {{ endif }}
-
- <span id="nav-link-wrapper" >
-
- {{ if $nav.register }}<a id="nav-register-link" class="nav-commlink $nav.register.2" href="$nav.register.0" title="$nav.register.3" >$nav.register.1</a>{{ endif }}
-
- <a id="nav-help-link" class="nav-link $nav.help.2" target="friendika-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a>
-
- {{ if $nav.apps }}<a id="nav-apps-link" class="nav-link $nav.apps.2" href="$nav.apps.0" title="$nav.apps.3" >$nav.apps.1</a>{{ endif }}
-
- <a id="nav-search-link" class="nav-link $nav.search.2" href="$nav.search.0" title="$nav.search.3" >$nav.search.1</a>
- <a id="nav-directory-link" class="nav-link $nav.directory.2" href="$nav.directory.0" title="$nav.directory.3" >$nav.directory.1</a>
-
- {{ if $nav.admin }}<a id="nav-admin-link" class="nav-link $nav.admin.2" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a>{{ endif }}
-
- {{ if $nav.network }}
- <a id="nav-network-link" class="nav-commlink $nav.network.2" href="$nav.network.0" title="$nav.network.3" >$nav.network.1</a>
- <span id="net-update" class="nav-ajax-left"></span>
- {{ endif }}
- {{ if $nav.home }}
- <a id="nav-home-link" class="nav-commlink $nav.home.2" href="$nav.home.0" title="$nav.home.3" >$nav.home.1</a>
- <span id="home-update" class="nav-ajax-left"></span>
- {{ endif }}
- {{ if $nav.community }}
- <a id="nav-community-link" class="nav-commlink $nav.community.2" href="$nav.community.0" title="$nav.community.3" >$nav.community.1</a>
- {{ endif }}
- {{ if $nav.notifications }}
- <a id="nav-notify-link" class="nav-commlink $nav.notifications.2" href="$nav.notifications.0" title="$nav.notifications.3" >$nav.notifications.1</a>
- <span id="notify-update" class="nav-ajax-left"></span>
- {{ endif }}
- {{ if $nav.messages }}
- <a id="nav-messages-link" class="nav-commlink $nav.messages.2" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a>
- <span id="mail-update" class="nav-ajax-left"></span>
- {{ endif }}
-
- {{ if $nav.manage }}<a id="nav-manage-link" class="nav-commlink $nav.manage.2" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a>{{ endif }}
-
- {{ if $nav.settings }}<a id="nav-settings-link" class="nav-link $nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a>{{ endif }}
- {{ if $nav.profiles }}<a id="nav-profiles-link" class="nav-link $nav.profiles.2" href="$nav.profiles.0" title="$nav.profiles.3" >$nav.profiles.1</a>{{ endif }}
-
- {{ if $nav.contacts }}<a id="nav-contacts-link" class="nav-link $nav.contacts.2" href="$nav.contacts.0" title="$nav.contacts.3" >$nav.contacts.1</a>{{ endif }}
- </span>
- <span id="nav-end"></span>
- <span id="banner">$banner</span>
-</nav>
diff --git a/view/theme/shady/theme.php b/view/theme/shady/theme.php
new file mode 100644
index 000000000..47b43cf13
--- /dev/null
+++ b/view/theme/shady/theme.php
@@ -0,0 +1,4 @@
+<?php
+$a->theme_info = array(
+ 'extends' => 'loozah',
+);
diff --git a/view/theme/three-d/nav.tpl b/view/theme/three-d/nav.tpl
deleted file mode 100644
index 2cd29a7c2..000000000
--- a/view/theme/three-d/nav.tpl
+++ /dev/null
@@ -1,51 +0,0 @@
-<nav>
- $langselector
-
- <div id="site-location">$sitelocation</div>
-
- {{ if $nav.logout }}<a id="nav-logout-link" class="nav-link $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a> {{ endif }}
- {{ if $nav.login }}<a id="nav-login-link" class="nav-login-link $nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a> {{ endif }}
-
- <span id="nav-link-wrapper" >
-
- {{ if $nav.register }}<a id="nav-register-link" class="nav-commlink $nav.register.2" href="$nav.register.0" title="$nav.register.3" >$nav.register.1</a>{{ endif }}
-
- <a id="nav-help-link" class="nav-link $nav.help.2" target="friendika-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a>
-
- {{ if $nav.apps }}<a id="nav-apps-link" class="nav-link $nav.apps.2" href="$nav.apps.0" title="$nav.apps.3" >$nav.apps.1</a>{{ endif }}
-
- <a id="nav-search-link" class="nav-link $nav.search.2" href="$nav.search.0" title="$nav.search.3" >$nav.search.1</a>
- <a id="nav-directory-link" class="nav-link $nav.directory.2" href="$nav.directory.0" title="$nav.directory.3" >$nav.directory.1</a>
-
- {{ if $nav.admin }}<a id="nav-admin-link" class="nav-link $nav.admin.2" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a>{{ endif }}
-
- {{ if $nav.network }}
- <a id="nav-network-link" class="nav-commlink $nav.network.2" href="$nav.network.0" title="$nav.network.3" >$nav.network.1</a>
- <span id="net-update" class="nav-ajax-left"></span>
- {{ endif }}
- {{ if $nav.home }}
- <a id="nav-home-link" class="nav-commlink $nav.home.2" href="$nav.home.0" title="$nav.home.3" >$nav.home.1</a>
- <span id="home-update" class="nav-ajax-left"></span>
- {{ endif }}
- {{ if $nav.community }}
- <a id="nav-community-link" class="nav-commlink $nav.community.2" href="$nav.community.0" title="$nav.community.3" >$nav.community.1</a>
- {{ endif }}
- {{ if $nav.notifications }}
- <a id="nav-notify-link" class="nav-commlink $nav.notifications.2" href="$nav.notifications.0" title="$nav.notifications.3" >$nav.notifications.1</a>
- <span id="notify-update" class="nav-ajax-left"></span>
- {{ endif }}
- {{ if $nav.messages }}
- <a id="nav-messages-link" class="nav-commlink $nav.messages.2" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a>
- <span id="mail-update" class="nav-ajax-left"></span>
- {{ endif }}
-
- {{ if $nav.manage }}<a id="nav-manage-link" class="nav-commlink $nav.manage.2" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a>{{ endif }}
-
- {{ if $nav.settings }}<a id="nav-settings-link" class="nav-link $nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a>{{ endif }}
- {{ if $nav.profiles }}<a id="nav-profiles-link" class="nav-link $nav.profiles.2" href="$nav.profiles.0" title="$nav.profiles.3" >$nav.profiles.1</a>{{ endif }}
-
- {{ if $nav.contacts }}<a id="nav-contacts-link" class="nav-link $nav.contacts.2" href="$nav.contacts.0" title="$nav.contacts.3" >$nav.contacts.1</a>{{ endif }}
- </span>
- <span id="nav-end"></span>
- <span id="banner">$banner</span>
-</nav>
diff --git a/view/theme/three-d/theme.php b/view/theme/three-d/theme.php
new file mode 100644
index 000000000..47b43cf13
--- /dev/null
+++ b/view/theme/three-d/theme.php
@@ -0,0 +1,4 @@
+<?php
+$a->theme_info = array(
+ 'extends' => 'loozah',
+);
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-11 00:28:38 +0000