13 files changed, 131 insertions, 27 deletions
diff --git a/view/apiconfig.tpl b/view/apiconfig.tpl
new file mode 100644
index 000000000..71ab241ce
--- /dev/null
+++ b/view/apiconfig.tpl
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<config>
+ <site>
+  <name>$sitedesc</name>
+  <server>$sitename</server>
+  <theme>default</theme>
+  <path></path>
+  <logo>$sitelogo</logo>
+
+  <fancy>true</fancy>
+  <language>en</language>
+  <email>$adminemail</email>
+  <broughtby></broughtby>
+  <broughtbyurl></broughtbyurl>
+  <timezone>UTC</timezone>
+  <closed>$siteclosed</closed>
+
+  <inviteonly>false</inviteonly>
+  <private>$siteprivate</private>
+  <textlimit>$textlimit</textlimit>
+  <ssl>$has_ssl</ssl>
+  <sslserver>$ssl_server</sslserver>
+  <shorturllength>30</shorturllength>
+
+</site>
+ <license>
+  <type>cc</type>
+  <owner></owner>
+  <url>http://creativecommons.org/licenses/by/3.0/</url>
+  <title>Creative Commons Attribution 3.0</title>
+  <image>http://i.creativecommons.org/l/by/3.0/80x15.png</image>
+
+</license>
+ <nickname>
+  <featured></featured>
+</nickname>
+ <profile>
+  <biolimit></biolimit>
+</profile>
+ <group>
+  <desclimit></desclimit>
+</group>
+ <notice>
+
+  <contentlimit></contentlimit>
+</notice>
+ <throttle>
+  <enabled>false</enabled>
+  <count>20</count>
+  <timespan>600</timespan>
+</throttle>
+ <xmpp>
+
+  <enabled>false</enabled>
+  <server>INVALID SERVER</server>
+  <port>5222</port>
+  <user>update</user>
+</xmpp>
+ <integration>
+  <source>StatusNet</source>
+
+</integration>
+ <attachments>
+  <uploads>false</uploads>
+  <file_quota>0</file_quota>
+</attachments>
+</config>
diff --git a/view/diasp_dec_hdr.tpl b/view/diasp_dec_hdr.tpl
new file mode 100644
index 000000000..e87c61888
--- /dev/null
+++ b/view/diasp_dec_hdr.tpl
@@ -0,0 +1,8 @@
+<decrypted_hdeader>
+  <iv>$inner_iv</iv>
+  <aes_key>$inner_key</aes_key>
+  <author>
+    <name>$author_name</name>
+    <uri>$author_uri</uri>
+  </author>
+</decrypted_header>
diff --git a/view/field_intcheckbox.tpl b/view/field_intcheckbox.tpl
new file mode 100644
index 000000000..47a513a55
--- /dev/null
+++ b/view/field_intcheckbox.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' value="$field.3" {{ if $field.2 }}checked="true"{{ endif }}>
+		<span class='field_help'>$field.4</span>
+	</div>
diff --git a/view/install_db.tpl b/view/install_db.tpl
index 6a4d1e2a2..ff4e11ab1 100644
--- a/view/install_db.tpl
+++ b/view/install_db.tpl
@@ -27,7 +27,7 @@ $lbl_03 $lbl_04 $lbl_05
 <div id="install-dbdata-end"></div>
 
 <label for="install-admin" id="install-admin-label">$lbl_11</label>
-<input type="text" name="adminemail" id="install-admin"  value="$adminemail" />
+<input type="text" name="adminmail" id="install-admin"  value="$adminmail" />
 <div id="install-admin-end"></div>
 
 <div id="install-tz-desc">
diff --git a/view/jot-header.tpl b/view/jot-header.tpl
index 29ba38538..7e7e393ac 100644
--- a/view/jot-header.tpl
+++ b/view/jot-header.tpl
@@ -9,7 +9,7 @@ tinyMCE.init({
 	theme : "advanced",
 	mode : "specific_textareas",
 	editor_selector: /(profile-jot-text|prvmail-text)/,
-	plugins : "bbcode,paste",
+	plugins : "bbcode,paste,autoresize",
 	theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code",
 	theme_advanced_buttons2 : "",
 	theme_advanced_buttons3 : "",
diff --git a/view/nav.tpl b/view/nav.tpl
index 008278dc4..09a25ac83 100644
--- a/view/nav.tpl
+++ b/view/nav.tpl
@@ -2,48 +2,48 @@ $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">$nav.logout.1</a> {{ endif }}
-{{ if $nav.login }}<a id="nav-login-link" class="nav-login-link $nav.login.2" href="$nav.login.0">$nav.login.1</a> {{ endif }}
+{{ 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">$nav.register.1</a>{{ endif }}
+{{ 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">$nav.help.1</a>
+<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">$nav.apps.1</a>{{ endif }}
+{{ 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">$nav.search.1</a>
-<a id="nav-directory-link" class="nav-link $nav.directory.2" href="$nav.directory.0">$nav.directory.1</a>
+<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">$nav.admin.1</a>{{ endif }}
+{{ 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">$nav.network.1</a>
+<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">$nav.home.1</a>
+<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">$nav.community.1</a>
+<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">$nav.notifications.1</a>
+<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">$nav.messages.1</a>
+<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">$nav.manage.1</a>{{ 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">$nav.settings.1</a>{{ endif }}
-{{ if $nav.profiles }}<a id="nav-profiles-link" class="nav-link $nav.profiles.2" href="$nav.profiles.0">$nav.profiles.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">$nav.contacts.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>
diff --git a/view/register.tpl b/view/register.tpl
index ac8388de4..16e8ba767 100644
--- a/view/register.tpl
+++ b/view/register.tpl
@@ -16,6 +16,17 @@
 	</div>
 	<div id="register-openid-end" ></div>
 
+{{ if $invitations }}
+
+	<p id="register-invite-desc">$invite_desc</p>
+	<div id="register-invite-wrapper" >
+		<label for="register-invite" id="label-register-invite" >$invite_label</label>
+		<input type="text" maxlength="60" size="32" name="invite_id" id="register-invite" value="$invite_id" >
+	</div>
+	<div id="register-name-end" ></div>
+
+{{ endif }}
+
 
 	<div id="register-name-wrapper" >
 		<label for="register-name" id="label-register-name" >$namelabel</label>
diff --git a/view/settings.tpl b/view/settings.tpl
index 5e8b90769..b79fbfe43 100644
--- a/view/settings.tpl
+++ b/view/settings.tpl
@@ -15,8 +15,9 @@ $nickname_block
 {{inc field_password.tpl with $field=$password1 }}{{endinc}}
 {{inc field_password.tpl with $field=$password2 }}{{endinc}}
 
+{{ if $oid_enable }}
 {{inc field_input.tpl with $field=$openid }}{{endinc}}
-
+{{ endif }}
 
 <div class="settings-submit-wrapper" >
 <input type="submit" name="submit" class="settings-submit" value="$submit" />
@@ -82,11 +83,11 @@ $hide_wall
 <div id="settings-notify-desc">$lbl_not </div>
 
 <div class="group">
-{{inc field_checkbox.tpl with $field=$notify1 }}{{endinc}}
-{{inc field_checkbox.tpl with $field=$notify2 }}{{endinc}}
-{{inc field_checkbox.tpl with $field=$notify3 }}{{endinc}}
-{{inc field_checkbox.tpl with $field=$notify4 }}{{endinc}}
-{{inc field_checkbox.tpl with $field=$notify5 }}{{endinc}}
+{{inc field_intcheckbox.tpl with $field=$notify1 }}{{endinc}}
+{{inc field_intcheckbox.tpl with $field=$notify2 }}{{endinc}}
+{{inc field_intcheckbox.tpl with $field=$notify3 }}{{endinc}}
+{{inc field_intcheckbox.tpl with $field=$notify4 }}{{endinc}}
+{{inc field_intcheckbox.tpl with $field=$notify5 }}{{endinc}}
 </div>
 
 
diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index 4d83cbb7a..b4feaaa27 100644
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -45,8 +45,8 @@ code {
 	border: 1px solid #444;
 	background: #EEE;
 	color: #444;
-	padding: 10px;
-	margin-top: 20px;
+	padding: 0px 10px 10px 10px;
+	margin-top: 20px; 
 }
 /*blockquote:before {
 	content: '>> ';
diff --git a/view/theme/greenzero/greenicons.png b/view/theme/greenzero/greenicons.png
new file mode 100644
index 000000000..b20ac5c0d
--- /dev/null
+++ b/view/theme/greenzero/greenicons.png
diff --git a/view/theme/greenzero/style.css b/view/theme/greenzero/style.css
index 51fcc09ae..ab309930c 100644
--- a/view/theme/greenzero/style.css
+++ b/view/theme/greenzero/style.css
@@ -12,6 +12,13 @@ a:hover {text-decoration: underline; }
 	color: #ffffff;
 }
 
+.icon {
+	display: block; width: 16px; height: 16px;
+	background-image: url('greenicons.png');
+}
+
+
+
 body { 	background-image: url(head.jpg); }
 aside( 	background-image: url(border.jpg); }
 section { 	background-image: url(border.jpg); }
diff --git a/view/xrd_diaspora.tpl b/view/xrd_diaspora.tpl
new file mode 100644
index 000000000..25cda533c
--- /dev/null
+++ b/view/xrd_diaspora.tpl
@@ -0,0 +1,3 @@
+	<Link rel="http://joindiaspora.com/seed_location" type="text/html" href="$baseurl/" />
+	<Link rel="http://joindiaspora.com/guid" type="text/html" href="$dspr_guid" />
+	<Link rel="diaspora-public-key" type="RSA" href="$dspr_key" />
diff --git a/view/xrd_person.tpl b/view/xrd_person.tpl
index b99f7c1fc..0dabaa5a3 100644
--- a/view/xrd_person.tpl
+++ b/view/xrd_person.tpl
@@ -19,6 +19,7 @@
     <Link rel="http://webfinger.net/rel/avatar"
           type="image/jpeg"
           href="$photo" />
+	$dspr
     <Link rel="salmon" 
           href="$salmon" />
     <Link rel="http://salmon-protocol.org/ns/salmon-replies"