Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  rev update
  diabook-themes: deleted obsolete diabook-folder & minor bug-fixes

* master:

boot.php

@@ -9,7 +9,7 @@ require_once('include/nav.php');
 require_once('include/cache.php');
 
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
-define ( 'FRIENDICA_VERSION',      '2.3.1318' );
+define ( 'FRIENDICA_VERSION',      '2.3.1319' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
 define ( 'DB_UPDATE_VERSION',      1138      );
 

util/messages.po

@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 2.3.1318\n"
+"Project-Id-Version: 2.3.1319\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-04-20 10:00-0700\n"
+"POT-Creation-Date: 2012-04-21 10:00-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -160,11 +160,13 @@ msgstr ""
 #: ../../addon/posterous/posterous.php:90
 #: ../../view/theme/diabook-red/config.php:76
 #: ../../view/theme/diabook-blue/config.php:76
+#: ../../view/theme/diabook/diabook-green/config.php:76
 #: ../../view/theme/diabook/diabook-red/config.php:76
 #: ../../view/theme/diabook/diabook-blue/config.php:76
+#: ../../view/theme/diabook/diabook-dark/config.php:76
 #: ../../view/theme/diabook/diabook-aerith/config.php:76
 #: ../../view/theme/diabook/diabook-pink/config.php:76
-#: ../../view/theme/diabook/config.php:87
+#: ../../view/theme/diabook/config.php:91
 #: ../../view/theme/quattro/config.php:52
 #: ../../view/theme/diabook-aerith/config.php:76
 #: ../../include/conversation.php:555
@@ -227,9 +229,11 @@ msgstr ""
 
 #: ../../mod/events.php:296 ../../view/theme/diabook-red/theme.php:231
 #: ../../view/theme/diabook-blue/theme.php:231
+#: ../../view/theme/diabook/diabook-green/theme.php:233
 #: ../../view/theme/diabook/diabook-red/theme.php:231
 #: ../../view/theme/diabook/diabook-blue/theme.php:231
-#: ../../view/theme/diabook/theme.php:249
+#: ../../view/theme/diabook/theme.php:251
+#: ../../view/theme/diabook/diabook-dark/theme.php:233
 #: ../../view/theme/diabook/diabook-aerith/theme.php:233
 #: ../../view/theme/diabook/diabook-pink/theme.php:233
 #: ../../view/theme/diabook-aerith/theme.php:233 ../../include/nav.php:52
@@ -367,9 +371,11 @@ msgstr ""
 #: ../../mod/photos.php:1394 ../../addon/communityhome/communityhome.php:110
 #: ../../view/theme/diabook-red/theme.php:115
 #: ../../view/theme/diabook-blue/theme.php:115
+#: ../../view/theme/diabook/diabook-green/theme.php:116
 #: ../../view/theme/diabook/diabook-red/theme.php:115
 #: ../../view/theme/diabook/diabook-blue/theme.php:115
-#: ../../view/theme/diabook/theme.php:128
+#: ../../view/theme/diabook/theme.php:130
+#: ../../view/theme/diabook/diabook-dark/theme.php:116
 #: ../../view/theme/diabook/diabook-aerith/theme.php:116
 #: ../../view/theme/diabook/diabook-pink/theme.php:116
 #: ../../view/theme/diabook-aerith/theme.php:116
@@ -397,9 +403,11 @@ msgstr ""
 #: ../../addon/communityhome/communityhome.php:111
 #: ../../view/theme/diabook-red/theme.php:116
 #: ../../view/theme/diabook-blue/theme.php:116
+#: ../../view/theme/diabook/diabook-green/theme.php:117
 #: ../../view/theme/diabook/diabook-red/theme.php:116
 #: ../../view/theme/diabook/diabook-blue/theme.php:116
-#: ../../view/theme/diabook/theme.php:129
+#: ../../view/theme/diabook/theme.php:131
+#: ../../view/theme/diabook/diabook-dark/theme.php:117
 #: ../../view/theme/diabook/diabook-aerith/theme.php:117
 #: ../../view/theme/diabook/diabook-pink/theme.php:117
 #: ../../view/theme/diabook-aerith/theme.php:117
@@ -426,9 +434,11 @@ msgstr ""
 #: ../../addon/communityhome/communityhome.php:163
 #: ../../view/theme/diabook-red/theme.php:87
 #: ../../view/theme/diabook-blue/theme.php:87
+#: ../../view/theme/diabook/diabook-green/theme.php:88
 #: ../../view/theme/diabook/diabook-red/theme.php:87
 #: ../../view/theme/diabook/diabook-blue/theme.php:87
-#: ../../view/theme/diabook/theme.php:100
+#: ../../view/theme/diabook/theme.php:102
+#: ../../view/theme/diabook/diabook-dark/theme.php:88
 #: ../../view/theme/diabook/diabook-aerith/theme.php:88
 #: ../../view/theme/diabook/diabook-pink/theme.php:88
 #: ../../view/theme/diabook-aerith/theme.php:88 ../../include/text.php:1304
@@ -608,9 +618,11 @@ msgstr ""
 
 #: ../../mod/community.php:30 ../../view/theme/diabook-red/theme.php:233
 #: ../../view/theme/diabook-blue/theme.php:233
+#: ../../view/theme/diabook/diabook-green/theme.php:235
 #: ../../view/theme/diabook/diabook-red/theme.php:233
 #: ../../view/theme/diabook/diabook-blue/theme.php:233
-#: ../../view/theme/diabook/theme.php:251
+#: ../../view/theme/diabook/theme.php:253
+#: ../../view/theme/diabook/diabook-dark/theme.php:235
 #: ../../view/theme/diabook/diabook-aerith/theme.php:235
 #: ../../view/theme/diabook/diabook-pink/theme.php:235
 #: ../../view/theme/diabook-aerith/theme.php:235 ../../include/nav.php:101
@@ -1256,9 +1268,11 @@ msgstr ""
 
 #: ../../mod/notifications.php:90 ../../view/theme/diabook-red/theme.php:227
 #: ../../view/theme/diabook-blue/theme.php:227
+#: ../../view/theme/diabook/diabook-green/theme.php:229
 #: ../../view/theme/diabook/diabook-red/theme.php:227
 #: ../../view/theme/diabook/diabook-blue/theme.php:227
-#: ../../view/theme/diabook/theme.php:245
+#: ../../view/theme/diabook/theme.php:247
+#: ../../view/theme/diabook/diabook-dark/theme.php:229
 #: ../../view/theme/diabook/diabook-aerith/theme.php:229
 #: ../../view/theme/diabook/diabook-pink/theme.php:229
 #: ../../view/theme/diabook-aerith/theme.php:229 ../../include/nav.php:77
@@ -1640,9 +1654,11 @@ msgstr ""
 
 #: ../../mod/contacts.php:529 ../../view/theme/diabook-red/theme.php:229
 #: ../../view/theme/diabook-blue/theme.php:229
+#: ../../view/theme/diabook/diabook-green/theme.php:231
 #: ../../view/theme/diabook/diabook-red/theme.php:229
 #: ../../view/theme/diabook/diabook-blue/theme.php:229
-#: ../../view/theme/diabook/theme.php:247
+#: ../../view/theme/diabook/theme.php:249
+#: ../../view/theme/diabook/diabook-dark/theme.php:231
 #: ../../view/theme/diabook/diabook-aerith/theme.php:231
 #: ../../view/theme/diabook/diabook-pink/theme.php:231
 #: ../../view/theme/diabook-aerith/theme.php:231 ../../include/nav.php:139
@@ -2557,9 +2573,11 @@ msgstr ""
 
 #: ../../mod/profperm.php:103 ../../view/theme/diabook-red/theme.php:228
 #: ../../view/theme/diabook-blue/theme.php:228
+#: ../../view/theme/diabook/diabook-green/theme.php:230
 #: ../../view/theme/diabook/diabook-red/theme.php:228
 #: ../../view/theme/diabook/diabook-blue/theme.php:228
-#: ../../view/theme/diabook/theme.php:246
+#: ../../view/theme/diabook/theme.php:248
+#: ../../view/theme/diabook/diabook-dark/theme.php:230
 #: ../../view/theme/diabook/diabook-aerith/theme.php:230
 #: ../../view/theme/diabook/diabook-pink/theme.php:230
 #: ../../view/theme/diabook-aerith/theme.php:230
@@ -2752,12 +2770,16 @@ msgstr ""
 #: ../../view/theme/diabook-red/theme.php:91
 #: ../../view/theme/diabook-blue/theme.php:82
 #: ../../view/theme/diabook-blue/theme.php:91
+#: ../../view/theme/diabook/diabook-green/theme.php:83
+#: ../../view/theme/diabook/diabook-green/theme.php:92
 #: ../../view/theme/diabook/diabook-red/theme.php:82
 #: ../../view/theme/diabook/diabook-red/theme.php:91
 #: ../../view/theme/diabook/diabook-blue/theme.php:82
 #: ../../view/theme/diabook/diabook-blue/theme.php:91
-#: ../../view/theme/diabook/theme.php:95
+#: ../../view/theme/diabook/theme.php:97
-#: ../../view/theme/diabook/theme.php:104
+#: ../../view/theme/diabook/theme.php:106
+#: ../../view/theme/diabook/diabook-dark/theme.php:83
+#: ../../view/theme/diabook/diabook-dark/theme.php:92
 #: ../../view/theme/diabook/diabook-aerith/theme.php:83
 #: ../../view/theme/diabook/diabook-aerith/theme.php:92
 #: ../../view/theme/diabook/diabook-pink/theme.php:83
@@ -2774,9 +2796,11 @@ msgstr ""
 #: ../../addon/communityhome/communityhome.php:172
 #: ../../view/theme/diabook-red/theme.php:96
 #: ../../view/theme/diabook-blue/theme.php:96
+#: ../../view/theme/diabook/diabook-green/theme.php:97
 #: ../../view/theme/diabook/diabook-red/theme.php:96
 #: ../../view/theme/diabook/diabook-blue/theme.php:96
-#: ../../view/theme/diabook/theme.php:109
+#: ../../view/theme/diabook/theme.php:111
+#: ../../view/theme/diabook/diabook-dark/theme.php:97
 #: ../../view/theme/diabook/diabook-aerith/theme.php:97
 #: ../../view/theme/diabook/diabook-pink/theme.php:97
 #: ../../view/theme/diabook-aerith/theme.php:97
@@ -2802,9 +2826,11 @@ msgstr ""
 
 #: ../../mod/fbrowser.php:23 ../../view/theme/diabook-red/theme.php:230
 #: ../../view/theme/diabook-blue/theme.php:230
+#: ../../view/theme/diabook/diabook-green/theme.php:232
 #: ../../view/theme/diabook/diabook-red/theme.php:230
 #: ../../view/theme/diabook/diabook-blue/theme.php:230
-#: ../../view/theme/diabook/theme.php:248
+#: ../../view/theme/diabook/theme.php:250
+#: ../../view/theme/diabook/diabook-dark/theme.php:232
 #: ../../view/theme/diabook/diabook-aerith/theme.php:232
 #: ../../view/theme/diabook/diabook-pink/theme.php:232
 #: ../../view/theme/diabook-aerith/theme.php:232 ../../include/nav.php:51
@@ -3962,9 +3988,11 @@ msgstr ""
 
 #: ../../mod/suggest.php:38 ../../view/theme/diabook-red/theme.php:143
 #: ../../view/theme/diabook-blue/theme.php:143
+#: ../../view/theme/diabook/diabook-green/theme.php:145
 #: ../../view/theme/diabook/diabook-red/theme.php:143
 #: ../../view/theme/diabook/diabook-blue/theme.php:143
-#: ../../view/theme/diabook/theme.php:157
+#: ../../view/theme/diabook/theme.php:159
+#: ../../view/theme/diabook/diabook-dark/theme.php:145
 #: ../../view/theme/diabook/diabook-aerith/theme.php:145
 #: ../../view/theme/diabook/diabook-pink/theme.php:145
 #: ../../view/theme/diabook-aerith/theme.php:145
@@ -3984,9 +4012,11 @@ msgstr ""
 
 #: ../../mod/directory.php:47 ../../view/theme/diabook-red/theme.php:141
 #: ../../view/theme/diabook-blue/theme.php:141
+#: ../../view/theme/diabook/diabook-green/theme.php:143
 #: ../../view/theme/diabook/diabook-red/theme.php:141
 #: ../../view/theme/diabook/diabook-blue/theme.php:141
-#: ../../view/theme/diabook/theme.php:155
+#: ../../view/theme/diabook/theme.php:157
+#: ../../view/theme/diabook/diabook-dark/theme.php:143
 #: ../../view/theme/diabook/diabook-aerith/theme.php:143
 #: ../../view/theme/diabook/diabook-pink/theme.php:143
 #: ../../view/theme/diabook-aerith/theme.php:143
@@ -4523,9 +4553,11 @@ msgstr ""
 #: ../../addon/communityhome/communityhome.php:155
 #: ../../view/theme/diabook-red/theme.php:79
 #: ../../view/theme/diabook-blue/theme.php:79
+#: ../../view/theme/diabook/diabook-green/theme.php:80
 #: ../../view/theme/diabook/diabook-red/theme.php:79
 #: ../../view/theme/diabook/diabook-blue/theme.php:79
-#: ../../view/theme/diabook/theme.php:92
+#: ../../view/theme/diabook/theme.php:94
+#: ../../view/theme/diabook/diabook-dark/theme.php:80
 #: ../../view/theme/diabook/diabook-aerith/theme.php:80
 #: ../../view/theme/diabook/diabook-pink/theme.php:80
 #: ../../view/theme/diabook-aerith/theme.php:80 ../../include/text.php:1302
@@ -5428,9 +5460,11 @@ msgstr ""
 
 #: ../../view/theme/diabook-red/theme.php:28
 #: ../../view/theme/diabook-blue/theme.php:28
+#: ../../view/theme/diabook/diabook-green/theme.php:29
 #: ../../view/theme/diabook/diabook-red/theme.php:28
 #: ../../view/theme/diabook/diabook-blue/theme.php:28
-#: ../../view/theme/diabook/theme.php:41
+#: ../../view/theme/diabook/theme.php:43
+#: ../../view/theme/diabook/diabook-dark/theme.php:29
 #: ../../view/theme/diabook/diabook-aerith/theme.php:29
 #: ../../view/theme/diabook/diabook-pink/theme.php:29
 #: ../../view/theme/diabook-aerith/theme.php:29
@@ -5439,9 +5473,11 @@ msgstr ""
 
 #: ../../view/theme/diabook-red/theme.php:57
 #: ../../view/theme/diabook-blue/theme.php:57
+#: ../../view/theme/diabook/diabook-green/theme.php:58
 #: ../../view/theme/diabook/diabook-red/theme.php:57
 #: ../../view/theme/diabook/diabook-blue/theme.php:57
-#: ../../view/theme/diabook/theme.php:70
+#: ../../view/theme/diabook/theme.php:72
+#: ../../view/theme/diabook/diabook-dark/theme.php:58
 #: ../../view/theme/diabook/diabook-aerith/theme.php:58
 #: ../../view/theme/diabook/diabook-pink/theme.php:58
 #: ../../view/theme/diabook-aerith/theme.php:58
@@ -5450,9 +5486,11 @@ msgstr ""
 
 #: ../../view/theme/diabook-red/theme.php:102
 #: ../../view/theme/diabook-blue/theme.php:102
+#: ../../view/theme/diabook/diabook-green/theme.php:103
 #: ../../view/theme/diabook/diabook-red/theme.php:102
 #: ../../view/theme/diabook/diabook-blue/theme.php:102
-#: ../../view/theme/diabook/theme.php:115
+#: ../../view/theme/diabook/theme.php:117
+#: ../../view/theme/diabook/diabook-dark/theme.php:103
 #: ../../view/theme/diabook/diabook-aerith/theme.php:103
 #: ../../view/theme/diabook/diabook-pink/theme.php:103
 #: ../../view/theme/diabook-aerith/theme.php:103
@@ -5461,9 +5499,11 @@ msgstr ""
 
 #: ../../view/theme/diabook-red/theme.php:139
 #: ../../view/theme/diabook-blue/theme.php:139
+#: ../../view/theme/diabook/diabook-green/theme.php:141
 #: ../../view/theme/diabook/diabook-red/theme.php:139
 #: ../../view/theme/diabook/diabook-blue/theme.php:139
-#: ../../view/theme/diabook/theme.php:153
+#: ../../view/theme/diabook/theme.php:155
+#: ../../view/theme/diabook/diabook-dark/theme.php:141
 #: ../../view/theme/diabook/diabook-aerith/theme.php:141
 #: ../../view/theme/diabook/diabook-pink/theme.php:141
 #: ../../view/theme/diabook-aerith/theme.php:141
@@ -5472,9 +5512,11 @@ msgstr ""
 
 #: ../../view/theme/diabook-red/theme.php:140
 #: ../../view/theme/diabook-blue/theme.php:140
+#: ../../view/theme/diabook/diabook-green/theme.php:142
 #: ../../view/theme/diabook/diabook-red/theme.php:140
 #: ../../view/theme/diabook/diabook-blue/theme.php:140
-#: ../../view/theme/diabook/theme.php:154
+#: ../../view/theme/diabook/theme.php:156
+#: ../../view/theme/diabook/diabook-dark/theme.php:142
 #: ../../view/theme/diabook/diabook-aerith/theme.php:142
 #: ../../view/theme/diabook/diabook-pink/theme.php:142
 #: ../../view/theme/diabook-aerith/theme.php:142
@@ -5483,9 +5525,11 @@ msgstr ""
 
 #: ../../view/theme/diabook-red/theme.php:142
 #: ../../view/theme/diabook-blue/theme.php:142
+#: ../../view/theme/diabook/diabook-green/theme.php:144
 #: ../../view/theme/diabook/diabook-red/theme.php:142
 #: ../../view/theme/diabook/diabook-blue/theme.php:142
-#: ../../view/theme/diabook/theme.php:156
+#: ../../view/theme/diabook/theme.php:158
+#: ../../view/theme/diabook/diabook-dark/theme.php:144
 #: ../../view/theme/diabook/diabook-aerith/theme.php:144
 #: ../../view/theme/diabook/diabook-pink/theme.php:144
 #: ../../view/theme/diabook-aerith/theme.php:144
@@ -5495,9 +5539,11 @@ msgstr ""
 
 #: ../../view/theme/diabook-red/theme.php:144
 #: ../../view/theme/diabook-blue/theme.php:144
+#: ../../view/theme/diabook/diabook-green/theme.php:146
 #: ../../view/theme/diabook/diabook-red/theme.php:144
 #: ../../view/theme/diabook/diabook-blue/theme.php:144
-#: ../../view/theme/diabook/theme.php:158
+#: ../../view/theme/diabook/theme.php:160
+#: ../../view/theme/diabook/diabook-dark/theme.php:146
 #: ../../view/theme/diabook/diabook-aerith/theme.php:146
 #: ../../view/theme/diabook/diabook-pink/theme.php:146
 #: ../../view/theme/diabook-aerith/theme.php:146
@@ -5509,12 +5555,16 @@ msgstr ""
 #: ../../view/theme/diabook-red/theme.php:234
 #: ../../view/theme/diabook-blue/theme.php:159
 #: ../../view/theme/diabook-blue/theme.php:234
+#: ../../view/theme/diabook/diabook-green/theme.php:161
+#: ../../view/theme/diabook/diabook-green/theme.php:236
 #: ../../view/theme/diabook/diabook-red/theme.php:159
 #: ../../view/theme/diabook/diabook-red/theme.php:234
 #: ../../view/theme/diabook/diabook-blue/theme.php:159
 #: ../../view/theme/diabook/diabook-blue/theme.php:234
-#: ../../view/theme/diabook/theme.php:174
+#: ../../view/theme/diabook/theme.php:176
-#: ../../view/theme/diabook/theme.php:252
+#: ../../view/theme/diabook/theme.php:254
+#: ../../view/theme/diabook/diabook-dark/theme.php:161
+#: ../../view/theme/diabook/diabook-dark/theme.php:236
 #: ../../view/theme/diabook/diabook-aerith/theme.php:161
 #: ../../view/theme/diabook/diabook-aerith/theme.php:236
 #: ../../view/theme/diabook/diabook-pink/theme.php:161
@@ -5526,9 +5576,11 @@ msgstr ""
 
 #: ../../view/theme/diabook-red/theme.php:192
 #: ../../view/theme/diabook-blue/theme.php:192
+#: ../../view/theme/diabook/diabook-green/theme.php:194
 #: ../../view/theme/diabook/diabook-red/theme.php:192
 #: ../../view/theme/diabook/diabook-blue/theme.php:192
-#: ../../view/theme/diabook/theme.php:207
+#: ../../view/theme/diabook/theme.php:209
+#: ../../view/theme/diabook/diabook-dark/theme.php:194
 #: ../../view/theme/diabook/diabook-aerith/theme.php:194
 #: ../../view/theme/diabook/diabook-pink/theme.php:194
 #: ../../view/theme/diabook-aerith/theme.php:194
@@ -5537,9 +5589,11 @@ msgstr ""
 
 #: ../../view/theme/diabook-red/theme.php:198
 #: ../../view/theme/diabook-blue/theme.php:198
+#: ../../view/theme/diabook/diabook-green/theme.php:200
 #: ../../view/theme/diabook/diabook-red/theme.php:198
 #: ../../view/theme/diabook/diabook-blue/theme.php:198
-#: ../../view/theme/diabook/theme.php:213
+#: ../../view/theme/diabook/theme.php:215
+#: ../../view/theme/diabook/diabook-dark/theme.php:200
 #: ../../view/theme/diabook/diabook-aerith/theme.php:200
 #: ../../view/theme/diabook/diabook-pink/theme.php:200
 #: ../../view/theme/diabook-aerith/theme.php:200
@@ -5548,9 +5602,11 @@ msgstr ""
 
 #: ../../view/theme/diabook-red/theme.php:227
 #: ../../view/theme/diabook-blue/theme.php:227
+#: ../../view/theme/diabook/diabook-green/theme.php:229
 #: ../../view/theme/diabook/diabook-red/theme.php:227
 #: ../../view/theme/diabook/diabook-blue/theme.php:227
-#: ../../view/theme/diabook/theme.php:245
+#: ../../view/theme/diabook/theme.php:247
+#: ../../view/theme/diabook/diabook-dark/theme.php:229
 #: ../../view/theme/diabook/diabook-aerith/theme.php:229
 #: ../../view/theme/diabook/diabook-pink/theme.php:229
 #: ../../view/theme/diabook-aerith/theme.php:229 ../../include/nav.php:49
@@ -5560,9 +5616,11 @@ msgstr ""
 
 #: ../../view/theme/diabook-red/theme.php:228
 #: ../../view/theme/diabook-blue/theme.php:228
+#: ../../view/theme/diabook/diabook-green/theme.php:230
 #: ../../view/theme/diabook/diabook-red/theme.php:228
 #: ../../view/theme/diabook/diabook-blue/theme.php:228
-#: ../../view/theme/diabook/theme.php:246
+#: ../../view/theme/diabook/theme.php:248
+#: ../../view/theme/diabook/diabook-dark/theme.php:230
 #: ../../view/theme/diabook/diabook-aerith/theme.php:230
 #: ../../view/theme/diabook/diabook-pink/theme.php:230
 #: ../../view/theme/diabook-aerith/theme.php:230 ../../include/nav.php:50
@@ -5571,9 +5629,11 @@ msgstr ""
 
 #: ../../view/theme/diabook-red/theme.php:229
 #: ../../view/theme/diabook-blue/theme.php:229
+#: ../../view/theme/diabook/diabook-green/theme.php:231
 #: ../../view/theme/diabook/diabook-red/theme.php:229
 #: ../../view/theme/diabook/diabook-blue/theme.php:229
-#: ../../view/theme/diabook/theme.php:247
+#: ../../view/theme/diabook/theme.php:249
+#: ../../view/theme/diabook/diabook-dark/theme.php:231
 #: ../../view/theme/diabook/diabook-aerith/theme.php:231
 #: ../../view/theme/diabook/diabook-pink/theme.php:231
 #: ../../view/theme/diabook-aerith/theme.php:231
@@ -5582,9 +5642,11 @@ msgstr ""
 
 #: ../../view/theme/diabook-red/theme.php:230
 #: ../../view/theme/diabook-blue/theme.php:230
+#: ../../view/theme/diabook/diabook-green/theme.php:232
 #: ../../view/theme/diabook/diabook-red/theme.php:230
 #: ../../view/theme/diabook/diabook-blue/theme.php:230
-#: ../../view/theme/diabook/theme.php:248
+#: ../../view/theme/diabook/theme.php:250
+#: ../../view/theme/diabook/diabook-dark/theme.php:232
 #: ../../view/theme/diabook/diabook-aerith/theme.php:232
 #: ../../view/theme/diabook/diabook-pink/theme.php:232
 #: ../../view/theme/diabook-aerith/theme.php:232 ../../include/nav.php:51
@@ -5593,9 +5655,11 @@ msgstr ""
 
 #: ../../view/theme/diabook-red/theme.php:231
 #: ../../view/theme/diabook-blue/theme.php:231
+#: ../../view/theme/diabook/diabook-green/theme.php:233
 #: ../../view/theme/diabook/diabook-red/theme.php:231
 #: ../../view/theme/diabook/diabook-blue/theme.php:231
-#: ../../view/theme/diabook/theme.php:249
+#: ../../view/theme/diabook/theme.php:251
+#: ../../view/theme/diabook/diabook-dark/theme.php:233
 #: ../../view/theme/diabook/diabook-aerith/theme.php:233
 #: ../../view/theme/diabook/diabook-pink/theme.php:233
 #: ../../view/theme/diabook-aerith/theme.php:233 ../../include/nav.php:52
@@ -5604,9 +5668,11 @@ msgstr ""
 
 #: ../../view/theme/diabook-red/theme.php:232
 #: ../../view/theme/diabook-blue/theme.php:232
+#: ../../view/theme/diabook/diabook-green/theme.php:234
 #: ../../view/theme/diabook/diabook-red/theme.php:232
 #: ../../view/theme/diabook/diabook-blue/theme.php:232
-#: ../../view/theme/diabook/theme.php:250
+#: ../../view/theme/diabook/theme.php:252
+#: ../../view/theme/diabook/diabook-dark/theme.php:234
 #: ../../view/theme/diabook/diabook-aerith/theme.php:234
 #: ../../view/theme/diabook/diabook-pink/theme.php:234
 #: ../../view/theme/diabook-aerith/theme.php:234 ../../include/nav.php:53
@@ -5615,9 +5681,11 @@ msgstr ""
 
 #: ../../view/theme/diabook-red/theme.php:232
 #: ../../view/theme/diabook-blue/theme.php:232
+#: ../../view/theme/diabook/diabook-green/theme.php:234
 #: ../../view/theme/diabook/diabook-red/theme.php:232
 #: ../../view/theme/diabook/diabook-blue/theme.php:232
-#: ../../view/theme/diabook/theme.php:250
+#: ../../view/theme/diabook/theme.php:252
+#: ../../view/theme/diabook/diabook-dark/theme.php:234
 #: ../../view/theme/diabook/diabook-aerith/theme.php:234
 #: ../../view/theme/diabook/diabook-pink/theme.php:234
 #: ../../view/theme/diabook-aerith/theme.php:234 ../../include/nav.php:53
@@ -5626,11 +5694,13 @@ msgstr ""
 
 #: ../../view/theme/diabook-red/config.php:78
 #: ../../view/theme/diabook-blue/config.php:78
+#: ../../view/theme/diabook/diabook-green/config.php:78
 #: ../../view/theme/diabook/diabook-red/config.php:78
 #: ../../view/theme/diabook/diabook-blue/config.php:78
+#: ../../view/theme/diabook/diabook-dark/config.php:78
 #: ../../view/theme/diabook/diabook-aerith/config.php:78
 #: ../../view/theme/diabook/diabook-pink/config.php:78
-#: ../../view/theme/diabook/config.php:89
+#: ../../view/theme/diabook/config.php:93
 #: ../../view/theme/quattro/config.php:54
 #: ../../view/theme/diabook-aerith/config.php:78
 msgid "Theme settings"
@@ -5638,38 +5708,44 @@ msgstr ""
 
 #: ../../view/theme/diabook-red/config.php:79
 #: ../../view/theme/diabook-blue/config.php:79
+#: ../../view/theme/diabook/diabook-green/config.php:79
 #: ../../view/theme/diabook/diabook-red/config.php:79
 #: ../../view/theme/diabook/diabook-blue/config.php:79
+#: ../../view/theme/diabook/diabook-dark/config.php:79
 #: ../../view/theme/diabook/diabook-aerith/config.php:79
 #: ../../view/theme/diabook/diabook-pink/config.php:79
-#: ../../view/theme/diabook/config.php:90
+#: ../../view/theme/diabook/config.php:94
 #: ../../view/theme/diabook-aerith/config.php:79
 msgid "Set font-size for posts and comments"
 msgstr ""
 
 #: ../../view/theme/diabook-red/config.php:80
 #: ../../view/theme/diabook-blue/config.php:80
+#: ../../view/theme/diabook/diabook-green/config.php:80
 #: ../../view/theme/diabook/diabook-red/config.php:80
 #: ../../view/theme/diabook/diabook-blue/config.php:80
+#: ../../view/theme/diabook/diabook-dark/config.php:80
 #: ../../view/theme/diabook/diabook-aerith/config.php:80
 #: ../../view/theme/diabook/diabook-pink/config.php:80
-#: ../../view/theme/diabook/config.php:91
+#: ../../view/theme/diabook/config.php:95
 #: ../../view/theme/diabook-aerith/config.php:80
 msgid "Set line-height for posts and comments"
 msgstr ""
 
 #: ../../view/theme/diabook-red/config.php:81
 #: ../../view/theme/diabook-blue/config.php:81
+#: ../../view/theme/diabook/diabook-green/config.php:81
 #: ../../view/theme/diabook/diabook-red/config.php:81
 #: ../../view/theme/diabook/diabook-blue/config.php:81
+#: ../../view/theme/diabook/diabook-dark/config.php:81
 #: ../../view/theme/diabook/diabook-aerith/config.php:81
 #: ../../view/theme/diabook/diabook-pink/config.php:81
-#: ../../view/theme/diabook/config.php:92
+#: ../../view/theme/diabook/config.php:96
 #: ../../view/theme/diabook-aerith/config.php:81
 msgid "Set resolution for middle column"
 msgstr ""
 
-#: ../../view/theme/diabook/config.php:93
+#: ../../view/theme/diabook/config.php:97
 msgid "Set color scheme"
 msgstr ""
 

view/theme/diabook-aerith/admin_users.tpl

@@ -1,89 +0,0 @@
-<script>
-	function confirm_delete(uname){
-		return confirm( "$confirm_delete".format(uname));
-	}
-	function confirm_delete_multi(){
-		return confirm("$confirm_delete_multi");
-	}
-	function selectall(cls){
-		$("."+cls).attr('checked','checked');
-		return false;
-	}
-</script>
-<div id='adminpage'>
-	<h1>$title - $page</h1>
-	
-	<form action="$baseurl/admin/users" method="post">
-        <input type='hidden' name='form_security_token' value='$form_security_token'>
-
-		<h3>$h_pending</h3>
-		{{ if $pending }}
-			<table id='pending'>
-				<thead>
-				<tr>
-					{{ for $th_pending as $th }}<th>$th</th>{{ endfor }}
-					<th></th>
-					<th></th>
-				</tr>
-				</thead>
-				<tbody>
-			{{ for $pending as $u }}
-				<tr>
-					<td class="created">$u.created</td>
-					<td class="name">$u.name</td>
-					<td class="email">$u.email</td>
-					<td class="checkbox"><input type="checkbox" class="pending_ckbx" id="id_pending_$u.hash" name="pending[]" value="$u.hash" /></td>
-					<td class="tools">
-						<a href="$baseurl/regmod/allow/$u.hash" title='$approve'><span class='icon like'></span></a>
-						<a href="$baseurl/regmod/deny/$u.hash" title='$deny'><span class='icon dislike'></span></a>
-					</td>
-				</tr>
-			{{ endfor }}
-				</tbody>
-			</table>
-			<div class='selectall'><a href='#' onclick="return selectall('pending_ckbx');">$select_all</a></div>
-			<div class="submit"><input type="submit" name="page_users_deny" value="$deny"/> <input type="submit" name="page_users_approve" value="$approve" /></div>			
-		{{ else }}
-			<p>$no_pending</p>
-		{{ endif }}
-	
-	
-		
-	
-		<h3>$h_users</h3>
-		{{ if $users }}
-			<table id='users'>
-				<thead>
-				<tr>
-					<th></th>
-					{{ for $th_users as $th }}<th>$th</th>{{ endfor }}
-					<th></th>
-					<th></th>
-				</tr>
-				</thead>
-				<tbody>
-				{{ for $users as $u }}
-					<tr>
-						<td><img src="$u.micro" alt="$u.nickname" title="$u.nickname"></td>
-						<td class='name'><a href="$u.url" title="$u.nickname" >$u.name</a></td>
-						<td class='email'>$u.email</td>
-						<td class='register_date'>$u.register_date</td>
-						<td class='login_date'>$u.login_date</td>
-						<td class='lastitem_date'>$u.lastitem_date</td>
-						<td class='login_date'>$u.page-flags</td>
-						<td class="checkbox"><input type="checkbox" class="users_ckbx" id="id_user_$u.uid" name="user[]" value="$u.uid"/></td>
-						<td class="tools" style="width:60px;">
-							<a href="$baseurl/admin/users/block/$u.uid?t=$form_security_token" title='{{ if $u.blocked }}$unblock{{ else }}$block{{ endif }}'><span class='icon block {{ if $u.blocked==0 }}dim{{ endif }}'></span></a>
-							<a href="$baseurl/admin/users/delete/$u.uid?t=$form_security_token" title='$delete' onclick="return confirm_delete('$u.name')"><span class='icon ad_drop'></span></a>
-						</td>
-					</tr>
-				{{ endfor }}
-				</tbody>
-			</table>
-			<div class='selectall'><a href='#' onclick="return selectall('users_ckbx');">$select_all</a></div>
-			<div class="submit"><input type="submit" name="page_users_block" value="$block/$unblock" /> <input type="submit" name="page_users_delete" value="$delete" onclick="return confirm_delete_multi()" /></div>						
-		{{ else }}
-			NO USERS?!?
-		{{ endif }}
-	</form>
-</div>

view/theme/diabook-aerith/ch_directory_item.tpl

@@ -1,10 +0,0 @@
-
-<div class="directory-item" id="directory-item-$id" >
-	<div class="directory-photo-wrapper" id="directory-photo-wrapper-$id" > 
-		<div class="directory-photo" id="directory-photo-$id" >
-			<a href="$profile-link" class="directory-profile-link" id="directory-profile-link-$id" >
-				<img class="directory-photo-img" src="$photo" alt="$alt-text" title="$alt-text" />
-			</a>
-		</div>
-	</div>
-</div>

view/theme/diabook-aerith/comment_item.tpl

@@ -1,41 +0,0 @@
-		<div class="comment-wwedit-wrapper" id="comment-edit-wrapper-$id" style="display: block;">
-			<form class="comment-edit-form" id="comment-edit-form-$id" action="item" method="post" onsubmit="post_comment($id); return false;">
-				<input type="hidden" name="type" value="$type" />
-				<input type="hidden" name="profile_uid" value="$profile_uid" />
-				<input type="hidden" name="parent" value="$parent" />
-				<input type="hidden" name="return" value="$return_path" />
-				<input type="hidden" name="jsreload" value="$jsreload" />
-				<input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" />
-
-				<div class="comment-edit-photo" id="comment-edit-photo-$id" >
-					<a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a>
-				</div>
-				<div class="comment-edit-photo-end"></div>
-				<textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);tautogrow($id)" onBlur="commentClose(this,$id);" >$comment</textarea>
-				<a class="icon bb-image" style="cursor: pointer;" onclick="insertFormatting('$comment','img',$id);">img</a>	
-				<a class="icon bb-url" style="cursor: pointer;" onclick="insertFormatting('$comment','url',$id);">url</a>
-				<a class="icon bb-video" style="cursor: pointer;" onclick="insertFormatting('$comment','video',$id);">video</a>														
-				<a class="icon underline" style="cursor: pointer;" onclick="insertFormatting('$comment','u',$id);">u</a>
-				<a class="icon italic" style="cursor: pointer;" onclick="insertFormatting('$comment','i',$id);">i</a>
-				<a class="icon bold" style="cursor: pointer;" onclick="insertFormatting('$comment','b',$id);">b</a>
-				<a class="icon quote" style="cursor: pointer;" onclick="insertFormatting('$comment','quote',$id);">quote</a>																			
-				{{ if $qcomment }}
-					<select id="qcomment-select-$id" name="qcomment-$id" class="qcomment" onchange="qCommentInsert(this,$id);" >
-					<option value=""></option>
-				{{ for $qcomment as $qc }}
-					<option value="$qc">$qc</option>				
-				{{ endfor }}
-					</select>
-				{{ endif }}
-
-				<div class="comment-edit-text-end"></div>
-				<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-$id" style="display: none;" >
-					<input type="submit" onclick="post_comment($id); return false;" id="comment-edit-submit-$id" class="comment-edit-submit" name="submit" value="$submit" />
-					<span onclick="preview_comment($id);" id="comment-edit-preview-link-$id" class="fakelink">$preview</span>
-					<div id="comment-edit-preview-$id" class="comment-edit-preview" style="display:none;"></div>
-				</div>
-
-				<div class="comment-edit-end"></div>
-			</form>
-
-		</div>

view/theme/diabook-aerith/communityhome.tpl

@@ -1,86 +0,0 @@
-<div id="close_pages">
-{{ if $page }}
-<div>$page</div>
-{{ endif }}
-</div>
-
-<div id="close_helpers">
-{{ if $lastusers_title }}
-<h3 style="margin-top:0px;">$helpers.title.1<a id="close_helpers_icon"  onClick="close_helpers()" class="icon close_box" title="close"></a></h3>
-<a href="http://kakste.com/profile/newhere" title="#NewHere" style="margin-left: 10px; " target="blank">NewHere</a><br>
-<a href="https://helpers.pyxis.uberspace.de/profile/helpers" style="margin-left: 10px; " title="Friendica Support" target="blank">Friendica Support</a><br>
-<a href="https://letstalk.pyxis.uberspace.de/profile/letstalk" style="margin-left: 10px; " title="Let's talk" target="blank">Let's talk</a><br>
-<a href="http://newzot.hydra.uberspace.de/profile/newzot" title="Local Friendica" style="margin-left: 10px; " target="blank">Local Friendica</a>
-{{ endif }}
-</div>
-
-<div id="close_services">
-{{ if $lastusers_title }}
-<h3>$con_services.title.1<a id="close_services_icon" onClick="close_services()" class="icon close_box" title="close"></a></h3>
-<div id="right_service_icons" style="margin-left: 16px; margin-top: 5px;">
-<a href="$url/facebook"><img alt="Facebook" src="view/theme/diabook-aerith/icons/facebook.png" title="Facebook"></a>
-<a href="$url/settings/connectors"><img alt="StatusNet" src="view/theme/diabook-aerith/icons/StatusNet.png?" title="StatusNet"></a>
-<a href="$url/settings/connectors"><img alt="LiveJournal" src="view/theme/diabook-aerith/icons/livejournal.png?" title="LiveJournal"></a>
-<a href="$url/settings/connectors"><img alt="Posterous" src="view/theme/diabook-aerith/icons/posterous.png?" title="Posterous"></a>
-<a href="$url/settings/connectors"><img alt="Tumblr" src="view/theme/diabook-aerith/icons/tumblr.png?" title="Tumblr"></a>
-<a href="$url/settings/connectors"><img alt="Twitter" src="view/theme/diabook-aerith/icons/twitter.png?" title="Twitter"></a>
-<a href="$url/settings/connectors"><img alt="WordPress" src="view/theme/diabook-aerith/icons/wordpress.png?" title="WordPress"></a>
-<a href="$url/settings/connectors"><img alt="E-Mail" src="view/theme/diabook-aerith/icons/email.png?" title="E-Mail"></a>
-</div>
-{{ endif }}
-</div>
-
-<div id="close_friends" style="margin-bottom:53px;">
-{{ if $nv }}
-<h3>$nv.title.1<a id="close_friends_icon" onClick="close_friends()"  class="icon close_box" title="close"></a></h3>
-<a class="$nv.directory.2" href="$nv.directory.0" style="margin-left: 10px; " title="$nv.directory.3" >$nv.directory.1</a><br>
-<a class="$nv.global_directory.2" href="$nv.global_directory.0" target="blank" style="margin-left: 10px; " title="$nv.global_directory.3" >$nv.global_directory.1</a><br>
-<a class="$nv.match.2" href="$nv.match.0" style="margin-left: 10px; " title="$nv.match.3" >$nv.match.1</a><br>
-<a class="$nv.suggest.2" href="$nv.suggest.0" style="margin-left: 10px; " title="$nv.suggest.3" >$nv.suggest.1</a><br>
-<a class="$nv.invite.2" href="$nv.invite.0" style="margin-left: 10px; " title="$nv.invite.3" >$nv.invite.1</a>			
-$nv.search
-{{ endif }}
-</div>
-
-<div id="close_lastusers">
-{{ if $lastusers_title }}
-<h3>$lastusers_title<a id="close_lastusers_icon" onClick="close_lastusers()" class="icon close_box" title="close"></a></h3>
-<div id='lastusers-wrapper' class='items-wrapper'>
-{{ for $lastusers_items as $i }}
-	$i
-{{ endfor }}
-</div>
-{{ endif }}
-</div>
-
-
-{{ if $activeusers_title }}
-<h3>$activeusers_title</h3>
-<div class='items-wrapper'>
-{{ for $activeusers_items as $i }}
-	$i
-{{ endfor }}
-</div>
-{{ endif }}
-
-<div id="close_lastphotos">
-{{ if $photos_title }}
-<h3>$photos_title<a id="close_photos_icon" onClick="close_lastphotos()"  class="icon close_box" title="close"></a></h3>
-<div id='ra-photos-wrapper' class='items-wrapper'>
-{{ for $photos_items as $i }}
-	$i
-{{ endfor }}
-</div>
-{{ endif }}
-</div>
-
-<div id="close_lastlikes">
-{{ if $like_title }}
-<h3>$like_title<a id="close_lastlikes_icon" onClick="close_lastlikes()" class="icon close_box" title="close"></a></h3>
-<ul id='likes'>
-{{ for $like_items as $i }}
-	<li id='ra-photos-wrapper'>$i</li>
-{{ endfor }}
-</ul>
-{{ endif }}
-</div>

view/theme/diabook-aerith/config.php

@@ -1,84 +0,0 @@
-<?php
-/**
- * Theme settings
- */
-
-
-
-function theme_content(&$a){
-	if(!local_user())
-		return;		
-	
-	$font_size = get_pconfig(local_user(), 'diabook-aerith', 'font_size' );
-	$line_height = get_pconfig(local_user(), 'diabook-aerith', 'line_height' );
-	$resolution = get_pconfig(local_user(), 'diabook-aerith', 'resolution' );
-	
-	return diabook_form($a,$font_size, $line_height,$resolution);
-}
-
-function theme_post(&$a){
-	if(! local_user())
-		return;
-	
-	if (isset($_POST['diabook-aerith-settings-submit'])){
-		set_pconfig(local_user(), 'diabook-aerith', 'font_size', $_POST['diabook-aerith_font_size']);
-		set_pconfig(local_user(), 'diabook-aerith', 'line_height', $_POST['diabook-aerith_line_height']);
-		set_pconfig(local_user(), 'diabook-aerith', 'resolution', $_POST['diabook-aerith_resolution']);	
-	}
-}
-
-
-function theme_admin(&$a){
-	$font_size = get_config('diabook-aerith', 'font_size' );
-	$line_height = get_config('diabook-aerith', 'line_height' );
-	$resolution = get_config('diabook-aerith', 'resolution' );
-	
-	return diabook_form($a,$font_size, $line_height,$resolution);
-}
-
-function theme_admin_post(&$a){
-	if (isset($_POST['diabook-aerith-settings-submit'])){
-		set_config('diabook-aerith', 'font_size', $_POST['diabook-aerith_font_size']);
-		set_config('diabook-aerith', 'line_height', $_POST['diabook-aerith_line_height']);
-		set_config('diabook-aerith', 'resolution', $_POST['diabook-aerith_resolution']);
-	}
-}
-
-
-function diabook_form(&$a, $font_size, $line_height, $resolution){
-	$line_heights = array(
-		"1.3"=>"1.3",
-		"---"=>"---",
-		"1.5"=>"1.5",		
-		"1.4"=>"1.4",
-		"1.2"=>"1.2",
-		"1.1"=>"1.1",
-	);
-	
-	$font_sizes = array(
-		'13'=>'13',
-		"---"=>"---",
-		"15"=>"15",
-		'14'=>'14',
-		'13.5'=>'13.5',		
-		'12.5'=>'12.5',
-		'12'=>'12',
-		);
-	$resolutions = array(
-		'normal'=>'normal',
-		'wide'=>'wide',		
-		);
-	
-	
-	
-	$t = file_get_contents( dirname(__file__). "/theme_settings.tpl" );
-	$o .= replace_macros($t, array(
-		'$submit' => t('Submit'),
-		'$baseurl' => $a->get_baseurl(),
-		'$title' => t("Theme settings"),
-		'$font_size' => array('diabook-aerith_font_size', t('Set font-size for posts and comments'), $font_size, '', $font_sizes),
-		'$line_height' => array('diabook-aerith_line_height', t('Set line-height for posts and comments'), $line_height, '', $line_heights),
-		'$resolution' => array('diabook-aerith_resolution', t('Set resolution for middle column'), $resolution, '', $resolutions),	
-	));
-	return $o;
-}

view/theme/diabook-aerith/contact_template.tpl

@@ -1,25 +0,0 @@
-
-<div class="contact-entry-wrapper" id="contact-entry-wrapper-$contact.id" >
-	<div class="contact-entry-photo-wrapper" >
-		<div class="contact-entry-photo mframe" id="contact-entry-photo-$contact.id"
-		onmouseover="if (typeof t$contact.id != 'undefined') clearTimeout(t$contact.id); openMenu('contact-photo-menu-button-$contact.id')" 
-		onmouseout="t$contact.id=setTimeout('closeMenu(\'contact-photo-menu-button-$contact.id\'); closeMenu(\'contact-photo-menu-$contact.id\');',200)" >
-
-			<a href="$contact.url" title="$contact.img_hover" /><img src="$contact.thumb" $contact.sparkle alt="$contact.name" /></a>
-
-			{{ if $contact.photo_menu }}
-			<span onclick="openClose('contact-photo-menu-$contact.id');" class="fakelink contact-photo-menu-button" id="contact-photo-menu-button-$contact.id">menu</span>
-                <div class="contact-photo-menu" id="contact-photo-menu-$contact.id">
-                    <ul>
-                        $contact.photo_menu
-                    </ul>
-                </div>
-			{{ endif }}
-		</div>
-			
-	</div>
-	<div class="contact-entry-photo-end" ></div>
-		<div class="contact-entry-name" id="contact-entry-name-$contact.id" >$contact.name</div>
-
-	<div class="contact-entry-end" ></div>
-</div>

view/theme/diabook-aerith/directory_item.tpl

@@ -1,11 +0,0 @@
-
-<div class="directory-item" id="directory-item-$id" >
-	<div class="directory-photo-wrapper" id="directory-photo-wrapper-$id" > 
-		<div class="directory-photo" id="directory-photo-$id" >
-			<a href="$profile-link" class="directory-profile-link" id="directory-profile-link-$id" >
-				<img class="directory-photo-img" src="$photo" alt="$alt-text" title="$alt-text" />
-			</a>
-		</div>
-	</div>
-	<div class="contact-name" id="directory-name-$id">$name</div>
-</div>

view/theme/diabook-aerith/generic_links_widget.tpl

@@ -1,11 +0,0 @@
-<div id="widget_$title">
-	{{if $title}}<h3 style="border-bottom: 1px solid #D2D2D2;">$title</h3>{{endif}}
-	{{if $desc}}<div class="desc">$desc</div>{{endif}}
-	
-	<ul  class="rs_tabs">
-		{{ for $items as $item }}
-			<li><a href="$item.url" class="rs_tab button {{ if $item.selected }}selected{{ endif }}">$item.label</a></li>
-		{{ endfor }}
-	</ul>
-	
-</div>

view/theme/diabook-aerith/group_side.tpl

@@ -1,34 +0,0 @@
-<div id="profile_side" >
-	<div class="">
-		<h3 style="margin-left: 2px;">$title<a href="group/new" title="$createtext" class="icon text_add"></a></h3>
-	</div>
-
-	<div id="sidebar-group-list">
-		<ul class="menu-profile-side">
-			{{ for $groups as $group }}
-			<li class="menu-profile-list">
-				<span class="menu-profile-icon {{ if $group.selected }}group_selected{{else}}group_unselected{{ endif }}"></span>
-				<a href="$group.href" class="menu-profile-list-item">
-					$group.text
-				</a>
-				{{ if $group.edit }}
-					<a href="$group.edit.href" class="action"><span class="icon text_edit" ></span></a>
-				{{ endif }}
-				{{ if $group.cid }}
-					<input type="checkbox" 
-						class="{{ if $group.selected }}ticked{{ else }}unticked {{ endif }} action" 
-						onclick="contactgroupChangeMember('$group.id','$group.cid');return true;"
-						{{ if $group.ismember }}checked="checked"{{ endif }}
-					/>
-				{{ endif }}
-			</li>
-			{{ endfor }}
-		</ul>
-	</div>
-	 {{ if $ungrouped }}
-  <div id="sidebar-ungrouped">
-  <a href="nogroup">$ungrouped</a>
-  </div>
-  {{ endif }}
-</div>	
-

view/theme/diabook-aerith/jot.tpl

@@ -1,85 +0,0 @@
-
-<div id="profile-jot-wrapper" >
-	<div id="profile-jot-banner-wrapper">
-		<div id="profile-jot-desc" >&nbsp;</div>
-	</div>
-	<div id="profile-jot-banner-end"></div>
-
-	<form id="profile-jot-form" action="$action" method="post" >
-		<input type="hidden" name="type" value="$ptyp" />
-		<input type="hidden" name="profile_uid" value="$profile_uid" />
-		<input type="hidden" name="return" value="$return_path" />
-		<input type="hidden" name="location" id="jot-location" value="$defloc" />
-		<input type="hidden" name="coord" id="jot-coord" value="" />
-		<input type="hidden" name="post_id" value="$post_id" />
-		<input type="hidden" name="preview" id="jot-preview" value="0" />
-		<input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none">
-		<div id="jot-category-wrap"><input name="category" id="jot-category" type="text" placeholder="$placeholdercategory" value="$category" class="jothidden" style="display:none" /></div>				
-		<div id="character-counter" class="grey"></div>		
-		<img id="profile-jot-text-loading" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
-		<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{ if $content }}$content{{ else }}$share{{ endif }}</textarea>
-
-
-<div id="profile-jot-submit-wrapper" class="jothidden">
-	
-	<div id="profile-upload-wrapper" style="display: $visitor;" >
-		<div id="wall-image-upload-div" ><a href="#" onclick="return false;" id="wall-image-upload" class="camera" title="$upload"></a></div>
-	</div> 
-	<div id="profile-attach-wrapper" style="display: $visitor;" >
-		<div id="wall-file-upload-div" ><a href="#" onclick="return false;" id="wall-file-upload" class="attach" title="$attach"></a></div>
-	</div> 
-
-	<div id="profile-link-wrapper" style="display: $visitor;" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >
-		<a id="profile-link" class="weblink" title="$weblink" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;"></a>
-	</div> 
-	<div id="profile-video-wrapper" style="display: $visitor;" >
-		<a id="profile-video" class="video2" title="$video" onclick="jotVideoURL();return false;"></a>
-	</div> 
-	<div id="profile-audio-wrapper" style="display: $visitor;" >
-		<a id="profile-audio" class="audio2" title="$audio" onclick="jotAudioURL();return false;"></a>
-	</div> 
-	<div id="profile-location-wrapper" style="display: $visitor;" >
-		<a id="profile-location" class="globe" title="$setloc" onclick="jotGetLocation();return false;"></a>
-	</div> 
-	<div id="profile-nolocation-wrapper" style="display: none;" >
-		<a id="profile-nolocation" class="noglobe" title="$noloc" onclick="jotClearLocation();return false;"></a>
-	</div> 
-
-	<input type="submit" id="profile-jot-submit" class="button creation2" name="submit" value="$share" />
-  
-   <span onclick="preview_post();" id="jot-preview-link" class="tab button">$preview</span>
-   
-	<div id="profile-jot-perms" class="profile-jot-perms" style="display: $pvisit;" >
-		<a href="#profile-jot-acl-wrapper" id="jot-perms-icon" class="icon $lockstate"  title="$permset" ></a>$bang
-	</div>
-
-
-	<div id="profile-jot-plugin-wrapper">
-  	$jotplugins
-	</div>
-	
-	<div id="profile-rotator-wrapper" style="display: $visitor;" >
-		<img id="profile-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
-	</div> 
-	
-	</div>
-   <div id="profile-jot-perms-end"></div>
-	
-	<div id="jot-preview-content" style="display:none;"></div>
-
-	<div style="display: none;">
-		<div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;">
-			$acl
-			<hr style="clear:both"/>
-			<div id="profile-jot-email-label">$emailcc</div><input type="text" name="emailcc" id="profile-jot-email" title="$emtitle" />
-			<div id="profile-jot-email-end"></div>
-			$jotnets
-		</div>
-	</div>
-
-
-
-
-</form>
-</div>
-		{{ if $content }}<script>initEditor();</script>{{ endif }}

view/theme/diabook-aerith/js/README

@@ -1,22 +0,0 @@
-jQuery Resize Plugin Demo
-
-Version: v2.1.1
-Author: Adeel Ejaz (http://adeelejaz.com/)
-License: Dual licensed under MIT and GPL licenses.
-
-Introduction
-aeImageResize is a jQuery plugin to dynamically resize the images without distorting the proportions.
-
-Usage:
-.aeImageResize( height, width )
-
-height
-An integer representing the maximum height for the image.
-
-width
-An integer representing the maximum width for the image.
-
-Example
-$(function() {
-  $( ".resizeme" ).aeImageResize({ height: 250, width: 250 });
-});

view/theme/diabook-aerith/js/jquery.ae.image.resize.js

@@ -1,69 +0,0 @@
-(function( $ ) {
-
-  $.fn.aeImageResize = function( params ) {
-
-    var aspectRatio = 0
-      // Nasty I know but it's done only once, so not too bad I guess
-      // Alternate suggestions welcome :)
-      ,	isIE6 = $.browser.msie && (6 == ~~ $.browser.version)
-      ;
-
-    // We cannot do much unless we have one of these
-    if ( !params.height && !params.width ) {
-      return this;
-    }
-
-    // Calculate aspect ratio now, if possible
-    if ( params.height && params.width ) {
-      aspectRatio = params.width / params.height;
-    }
-
-    // Attach handler to load
-    // Handler is executed just once per element
-    // Load event required for Webkit browsers
-    return this.one( "load", function() {
-
-      // Remove all attributes and CSS rules
-      this.removeAttribute( "height" );
-      this.removeAttribute( "width" );
-      this.style.height = this.style.width = "";
-
-      var imgHeight = this.height
-        , imgWidth = this.width
-        , imgAspectRatio = imgWidth / imgHeight
-        , bxHeight = params.height
-        , bxWidth = params.width
-        , bxAspectRatio = aspectRatio;
-				
-      // Work the magic!
-      // If one parameter is missing, we just force calculate it
-      if ( !bxAspectRatio ) {
-        if ( bxHeight ) {
-          bxAspectRatio = imgAspectRatio + 1;
-        } else {
-          bxAspectRatio = imgAspectRatio - 1;
-        }
-      }
-
-      // Only resize the images that need resizing
-      if ( (bxHeight && imgHeight > bxHeight) || (bxWidth && imgWidth > bxWidth) ) {
-
-        if ( imgAspectRatio > bxAspectRatio ) {
-          bxHeight = ~~ ( imgHeight / imgWidth * bxWidth );
-        } else {
-          bxWidth = ~~ ( imgWidth / imgHeight * bxHeight );
-        }
-
-        this.height = bxHeight;
-        this.width = bxWidth;
-      }
-    })
-    .each(function() {
-
-      // Trigger load event (for Gecko and MSIE)
-      if ( this.complete || isIE6 ) {
-        $( this ).trigger( "load" );
-      }
-    });
-  };
-})( jQuery );

view/theme/diabook-aerith/js/jquery.ae.image.resize.min.js

@@ -1 +0,0 @@
-(function(d){d.fn.aeImageResize=function(a){var i=0,j=d.browser.msie&&6==~~d.browser.version;if(!a.height&&!a.width)return this;if(a.height&&a.width)i=a.width/a.height;return this.one("load",function(){this.removeAttribute("height");this.removeAttribute("width");this.style.height=this.style.width="";var e=this.height,f=this.width,g=f/e,b=a.height,c=a.width,h=i;h||(h=b?g+1:g-1);if(b&&e>b||c&&f>c){if(g>h)b=~~(e/f*c);else c=~~(f/e*b);this.height=b;this.width=c}}).each(function(){if(this.complete||j)d(this).trigger("load")})}})(jQuery);

view/theme/diabook-aerith/js/jquery.autogrow.textarea.js

@@ -1,46 +0,0 @@
-(function($) {
-
-    /*
-     * Auto-growing textareas; technique ripped from Facebook
-     */
-    $.fn.autogrow = function(options) {
-        
-        this.filter('textarea').each(function() {
-            
-            var $this       = $(this),
-                minHeight   = $this.height(),
-                lineHeight  = $this.css('lineHeight');
-            
-            var shadow = $('<div></div>').css({
-                position:   'absolute',
-                top:        -10000,
-                left:       -10000,
-                width:      $(this).width(),
-                fontSize:   $this.css('fontSize'),
-                fontFamily: $this.css('fontFamily'),
-                lineHeight: $this.css('lineHeight'),
-                resize:     'none'
-            }).appendTo(document.body);
-            
-            var update = function() {
-                
-                var val = this.value.replace(/</g, '&lt;')
-                                    .replace(/>/g, '&gt;')
-                                    .replace(/&/g, '&amp;')
-                                    .replace(/\n/g, '<br/>');
-                
-                shadow.html(val);
-                $(this).css('height', Math.max(shadow.height() + 20, minHeight));
-            }
-            
-            $(this).change(update).keyup(update).keydown(update);
-            
-            update.apply(this);
-            
-        });
-        
-        return this;
-        
-    }
-    
-})(jQuery);

view/theme/diabook-aerith/js/jquery.cookie.js

@@ -1,47 +0,0 @@
-/*!
- * jQuery Cookie Plugin
- * https://github.com/carhartl/jquery-cookie
- *
- * Copyright 2011, Klaus Hartl
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://www.opensource.org/licenses/mit-license.php
- * http://www.opensource.org/licenses/GPL-2.0
- */
-(function($) {
-    $.cookie = function(key, value, options) {
-
-        // key and at least value given, set cookie...
-        if (arguments.length > 1 && (!/Object/.test(Object.prototype.toString.call(value)) || value === null || value === undefined)) {
-            options = $.extend({}, options);
-
-            if (value === null || value === undefined) {
-                options.expires = -1;
-            }
-
-            if (typeof options.expires === 'number') {
-                var days = options.expires, t = options.expires = new Date();
-                t.setDate(t.getDate() + days);
-            }
-
-            value = String(value);
-
-            return (document.cookie = [
-                encodeURIComponent(key), '=', options.raw ? value : encodeURIComponent(value),
-                options.expires ? '; expires=' + options.expires.toUTCString() : '', // use expires attribute, max-age is not supported by IE
-                options.path    ? '; path=' + options.path : '',
-                options.domain  ? '; domain=' + options.domain : '',
-                options.secure  ? '; secure' : ''
-            ].join(''));
-        }
-
-        // key and possibly options given, get cookie...
-        options = value || {};
-        var decode = options.raw ? function(s) { return s; } : decodeURIComponent;
-
-        var pairs = document.cookie.split('; ');
-        for (var i = 0, pair; pair = pairs[i] && pairs[i].split('='); i++) {
-            if (decode(pair[0]) === key) return decode(pair[1] || ''); // IE saves cookies with empty string as "c; ", e.g. without "=" as opposed to EOMB, thus pair[1] may be undefined
-        }
-        return null;
-    };
-})(jQuery);

view/theme/diabook-aerith/login.tpl

@@ -1,33 +0,0 @@
-
-<form action="$dest_url" method="post" >
-	<input type="hidden" name="auth-params" value="login" />
-
-	<div id="login_standard">
-	{{ inc field_input.tpl with $field=$lname }}{{ endinc }}
-	{{ inc field_password.tpl with $field=$lpassword }}{{ endinc }}
-	</div>
-	
-	{{ if $openid }}
-			<div id="login_openid">
-			{{ inc field_openid.tpl with $field=$lopenid }}{{ endinc }}
-			</div>
-	{{ endif }}
-	
-	<div id="login-submit-wrapper" >
-		<input type="submit" name="submit" id="login-submit-button" value="$login" />
-	</div>
-	
-   <div id="login-extra-links">
-		{{ if $register }}<a href="register" title="$register.title" id="register-link">$register.desc</a>{{ endif }}
-        <a href="lostpass" title="$lostpass" id="lost-password-link" >$lostlink</a>
-	</div>	
-	
-	{{ for $hiddens as $k=>$v }}
-		<input type="hidden" name="$k" value="$v" />
-	{{ endfor }}
-	
-	
-</form>
-
-
-<script type="text/javascript"> $(document).ready(function() { $("#id_$lname.0").focus();} );</script>

view/theme/diabook-aerith/mail_conv.tpl

@@ -1,60 +0,0 @@
-<div class="wall-item-container $item.indent">
-	<div class="wall-item-item">
-		<div class="wall-item-info">
-			<div class="contact-photo-wrapper"
-				<a href="$mail.profile_url" target="redir" title="$mail.from_name" class="contact-photo-link" id="wall-item-photo-link-$mail.id">
-					<img src="$mail.from_photo" class="contact-photo$mail.sparkle" id="wall-item-photo-$mail.id" alt="$mail.from_name" />
-				</a>
-			</div>
-		</div>
-		<div class="wall-item-content">
-			$mail.body
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="wall-item-links">
-		</div>
-		<div class="wall-item-tags">
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="">
-		</div>
-		<div class="wall-item-actions">
-			<div class="wall-item-actions-author">
-				<a href="$mail.from_url" target="redir" class="wall-item-name-link"><span class="wall-item-name$mail.sparkle">$mail.from_name</span></a> <span class="wall-item-ago">$mail.date</span>
-			</div>
-			
-			<div class="wall-item-actions-social">
-			</div>
-			
-			<div class="wall-item-actions-tools">
-				<a href="message/drop/$mail.id" onclick="return confirmDelete();" class="icon delete s16" title="$mail.delete">$mail.delete</a>
-			</div>
-			
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-	</div>
-</div>
-
-
-{#
-
-
-<div class="mail-conv-outside-wrapper">
-	<div class="mail-conv-sender" >
-		<a href="$mail.from_url" class="mail-conv-sender-url" ><img class="mframe mail-conv-sender-photo$mail.sparkle" src="$mail.from_photo" heigth="80" width="80" alt="$mail.from_name" /></a>
-	</div>
-	<div class="mail-conv-detail" >
-		<div class="mail-conv-sender-name" >$mail.from_name</div>
-		<div class="mail-conv-date">$mail.date</div>
-		<div class="mail-conv-subject">$mail.subject</div>
-		<div class="mail-conv-body">$mail.body</div>
-	<div class="mail-conv-delete-wrapper" id="mail-conv-delete-wrapper-$mail.id" ><a href="message/drop/$mail.id" class="icon drophide delete-icon mail-list-delete-icon" onclick="return confirmDelete();" title="$mail.delete" id="mail-conv-delete-icon-$mail.id" class="mail-conv-delete-icon" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a></div><div class="mail-conv-delete-end"></div>
-	<div class="mail-conv-outside-wrapper-end"></div>
-</div>
-</div>
-<hr class="mail-conv-break" />
-
-#}

view/theme/diabook-aerith/mail_display.tpl

@@ -1,12 +0,0 @@
-<div id="mail-display-subject">
-	<span class="{{if $thread_seen}}seen{{else}}unseen{{endif}}">$thread_subject</span>
-	<a href="message/dropconv/$thread_id" onclick="return confirmDelete();"  title="$delete" class="mail-delete icon s22 delete"></a>
-</div>
-
-{{ for $mails as $mail }}
-	<div id="tread-wrapper-$mail.id" class="tread-wrapper">
-		{{ inc mail_conv.tpl }}{{endinc}}
-	</div>
-{{ endfor }}
-
-{{ inc prv_message.tpl }}{{ endinc }}

view/theme/diabook-aerith/mail_list.tpl

@@ -1,8 +0,0 @@
-<div class="mail-list-wrapper">
-	<span class="mail-subject {{if $seen}}seen{{else}}unseen{{endif}}"><a href="message/$id" class="mail-link">$subject</a></span>
-	<span class="mail-from">$from_name</span>
-	<span class="mail-date">$date</span>
-	<span class="mail-count">$count</span>
-	
-	<a href="message/dropconv/$id" onclick="return confirmDelete();"  title="$delete" class="mail-delete icon s22 delete"></a>
-</div>

view/theme/diabook-aerith/message_side.tpl

@@ -1,10 +0,0 @@
-<div id="message-sidebar" class="widget">
-	<div id="message-new" class="{{ if $new.sel }}selected{{ endif }}"><a href="$new.url">$new.label</a> </div>
-	
-	<ul class="message-ul">
-		{{ for $tabs as $t }}
-			<li class="tool {{ if $t.sel }}selected{{ endif }}"><a href="$t.url" class="message-link">$t.label</a></li>
-		{{ endfor }}
-	</ul>
-	
-</div>

view/theme/diabook-aerith/nav.tpl

@@ -1,190 +0,0 @@
-<header>
-	<div id="site-location">$sitelocation</div>
-	<div id="banner">$banner</div>
-</header>
-<nav>
-			
-			
-	<ul>
-			
-			
-			{{ if $nav.network }}
-			<li id="nav-network-link" class="nav-menu-icon">
-				<a class="$nav.network.2" href="$nav.network.0" title="$nav.network.3" >
-				<span class="icon notifications">Benachrichtigungen</span>
-				<span id="net-update" class="nav-notify"></span></a>
-			</li>
-		    {{ endif }}
-	
-			{{ if $nav.contacts }}
-			<li class="nav-menu-icon" id="nav-contacts-linkmenu">
-				<a href="$nav.contacts.0" rel="#nav-contacts-menu" title="$nav.contacts.1">
-				<span class="icon contacts">$nav.contacts.1</span>
-				<span id="intro-update" class="nav-notify"></span></a>
-				<ul id="nav-contacts-menu" class="menu-popup">
-					<li id="nav-contacts-see-intro"><a href="$nav.notifications.0">$nav.introductions.1</a><span id="intro-update-li" class="nav-notify"></span></li>
-					<li id="nav-contacts-all"><a href="contacts">$nav.contacts.1</a></li> 
-				</ul>
-			</li>	
-
-			{{ endif }}
-			
-			{{ if $nav.messages }}
-			<li  id="nav-messages-linkmenu" class="nav-menu-icon">
-			  <a href="$nav.messages.0" rel="#nav-messages-menu" title="$nav.messages.1">
-			  <span class="icon messages">$nav.messages.1</span>
-				<span id="mail-update" class="nav-notify"></span></a>
-				<ul id="nav-messages-menu" class="menu-popup">
-					<li id="nav-messages-see-all"><a href="$nav.messages.0">$nav.messages.1</a></li>
-					<li id="nav-messages-see-all"><a href="$nav.messages.new.0">$nav.messages.new.1</a></li>
-				</ul>
-			</li>		
-			{{ endif }}
-		
-      {{ if $nav.notifications }}
-			<li  id="nav-notifications-linkmenu" class="nav-menu-icon">
-			<a href="$nav.notifications.0" rel="#nav-notifications-menu" title="$nav.notifications.1">
-			<span class="icon notify">$nav.notifications.1</span>
-				<span id="notify-update" class="nav-notify"></span></a>
-				<ul id="nav-notifications-menu" class="menu-popup">
-					<li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">$nav.notifications.mark.1</a></li>
-					<li id="nav-notifications-see-all"><a href="$nav.notifications.all.0">$nav.notifications.all.1</a></li>
-					<li class="empty">$emptynotifications</li>
-				</ul>
-			</li>		
-		{{ endif }}	
-			
-		{{ if $nav.search}}
-		<li id="search-box">
-			<form method="get" action="$nav.search.0">
-				<input id="search-text" class="nav-menu-search" type="text" value="" name="search">
-			</form>
-		</li>		
-		{{ endif }}	
-		
-		<li  style="width: 1%; height: 1px;float: right;"></li>	
-		
-		<li id="nav-site-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-site-menu"><span class="icon s22 gear">Site</span></a>
-			<ul id="nav-site-menu" class="menu-popup">
-				{{ if $nav.manage }}<li><a class="$nav.manage.2" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a></li>{{ endif }}				
-
-				{{ if $nav.settings }} <li><a class="$nav.search.2" onClick="restore_boxes()" title="Restore right-hand column" style="cursor: pointer;">Restore right-hand column</a></li>{{ endif }}
-										
-				{{ if $nav.help }} <li><a class="$nav.help.2" target="friendika-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a></li>{{ endif }}									
-										
-										 <li><a class="$nav.search.2" href="friendica" title="Site Info / Impressum" >Info/Impressum</a></li>
-										
-				{{ if $nav.settings }}<li><a class="menu-sep $nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a></li>{{ endif }}
-				{{ if $nav.admin }}<li><a class="$nav.admin.2" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a></li>{{ endif }}
-
-				{{ if $nav.logout }}<li><a class="menu-sep $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a></li>{{ endif }}
-
-				
-			</ul>		
-		</li>
-		
-		
-		{{ if $nav.directory }}
-		<li id="nav-directory-link" class="nav-menu $sel.directory">
-			<a class="$nav.directory.2" href="$nav.directory.0" title="$nav.directory.3" >$nav.directory.1</a>
-		</li>
-		{{ endif }}
-		
-		{{ if $nav.apps }}
-			<li id="nav-apps-link" class="nav-menu $sel.apps">
-				<a class=" $nav.apps.2" href="#" rel="#nav-apps-menu" title="$nav.apps.3" >$nav.apps.1</a>
-				<ul id="nav-apps-menu" class="menu-popup">
-					{{ for $apps as $ap }}
-					<li>$ap</li>
-					{{ endfor }}
-				</ul>
-			</li>	
-		{{ endif }}		
-		
-      {{ if $nav.home }}
-			<li id="nav-home-link" class="nav-menu $sel.home">
-				<a class="$nav.home.2" href="$nav.home.0" title="$nav.home.3" >$nav.home.1
-				<span id="home-update" class="nav-notify"></span></a>
-			</li>
-		{{ endif }}		
-		
-		{{ if $userinfo }}
-			<li id="nav-user-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-user-menu" title="$sitelocation"><img src="$userinfo.icon" alt="$userinfo.name"></a>
-				<ul id="nav-user-menu" class="menu-popup">
-					{{ for $nav.usermenu as $usermenu }}
-						<li><a class="$usermenu.2" href="$usermenu.0" title="$usermenu.3">$usermenu.1</a></li>
-					{{ endfor }}
-					
-					{{ if $nav.profiles }}<li><a class="menu-sep $nav.profiles.2" href="$nav.profiles.0" title="$nav.profiles.3" >$nav.profiles.3</a></li>{{ endif }}
-					{{ if $nav.notifications }}<li><a class="$nav.notifications.2" href="$nav.notifications.0" title="$nav.notifications.3" >$nav.notifications.1</a></li>{{ endif }}
-					{{ if $nav.messages }}<li><a class="$nav.messages.2" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a></li>{{ endif }}
-					{{ if $nav.contacts }}<li><a class="$nav.contacts.2" href="$nav.contacts.0" title="$nav.contacts.3" >$nav.contacts.1</a></li>{{ endif }}	
-				</ul>
-			</li>
-		{{ endif }}
-		
-					{{ if $nav.login }}
-					<li id="nav-home-link" class="nav-menu $sel.home">
-						<a class="$nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a>
-					<li>
-					{{ endif }}
-		
-		
-		
-	</ul>	
-
-
-	
-</nav>
-
-
-<div style="position: fixed; bottom: 5px; right: 10px;"><a href="javascript:scroll(0,0); "><img src="view/theme/diabook/icons/scroll_top.png" title="scroll to top"></a></div>
-<div style="position: fixed; bottom: 3px; left: 25px;">$langselector</div>
-<div style="position: fixed; bottom: 23px; left: 5px;"><a href="http://pad.toktan.org/p/diabook" target="blank" ><img src="view/theme/diabook/icons/bluebug.png" title="report bugs for the theme diabook"/></a></div>
-
-
-
-
-<ul id="nav-notifications-template" style="display:none;" rel="template">
-	<li class="{4}"><a href="{0}"><img src="{1}">{2} <span class="notif-when">{3}</span></a></li>
-</ul>
-
-
-
-{#
-
-{{ 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.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 }}
-
-
-</span>
-<span id="nav-end"></span>
-<span id="banner">$banner</span>
-#}

view/theme/diabook-aerith/nets.tpl

@@ -1,15 +0,0 @@
-<div id="profile_side">
-	<h3 style="margin-left: 2px;">$title</h3>
-	<div id="nets-desc">$desc</div>
-   
-	<ul class="menu-profile-side">
-	<li class="menu-profile-list">
-	<span class="menu-profile-icon {{ if $sel_all }}group_selected{{else}}group_unselected{{ endif }}"></span>	
-	<a style="text-decoration: none;" href="$base" class="menu-profile-list-item">$all</a></li>
-	{{ for $nets as $net }}
-	<li class="menu-profile-list">
-	<span class="menu-profile-icon {{ if $net.selected }}group_selected{{else}}group_unselected{{ endif }}"></span>	
-	<a href="$base?nets=$net.ref" class="menu-profile-list-item">$net.name</a></li>
-	{{ endfor }}
-	</ul>
-</div>

view/theme/diabook-aerith/oembed_video.tpl

@@ -1,4 +0,0 @@
-<a class="embed_yt" href='$embedurl' onclick='this.innerHTML=Base64.decode("$escapedhtml"); yt_iframe(); return false;' style='float:left; margin: 1em; position: relative;'>
-	<img width='$tw' height='$th' src='$turl' >
-	<div style='position: absolute; top: 0px; left: 0px; width: $twpx; height: $thpx; background: url(images/icons/48/play.png) no-repeat center center;'></div>
-</a>

view/theme/diabook-aerith/photo_item.tpl

@@ -1,65 +0,0 @@
-{{ if $indent }}{{ else }}
-<div class="wall-item-decor">
-	<img id="like-rotator-$id" class="like-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
-</div>
-{{ endif }}
-
-<div class="wall-item-photo-container $indent">
-	<div class="wall-item-item">
-		<div class="wall-item-info">
-			<div class="contact-photo-wrapper" >
-				<a href="$profile_url" target="redir" title="" class="contact-photo-link" id="wall-item-photo-link-$id">
-					<img src="$thumb" class="contact-photo$sparkle" id="wall-item-photo-$id" alt="$name" />
-				</a>
-				<a href="#" rel="#wall-item-photo-menu-$id" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$id">menu</a>
-				<ul class="contact-menu menu-popup" id="wall-item-photo-menu-$id">
-				$photo_menu
-				</ul>
-				
-			</div>
-		</div>
-			<div class="wall-item-actions-author">
-				<a href="$profile_url" target="redir" title="$name" class="wall-item-name-link"><span class="wall-item-name$sparkle">$name</span></a> 
-			<span class="wall-item-ago">-
-			{{ if $plink }}<a class="link" title="$plink.title" href="$plink.href" style="color: #999">$ago</a>{{ else }} $ago {{ endif }}
-			{{ if $lock }} - <span class="fakelink" style="color: #999" onclick="lockview(event,$id);">$lock</span> {{ endif }}
-			</span>
-			</div>
-		<div class="wall-item-content">
-			{{ if $title }}<h2><a href="$plink.href">$title</a></h2>{{ endif }}
-			$body
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="wall-item-links">
-		</div>
-		<div class="wall-item-tags">
-			{{ for $tags as $tag }}
-				<span class='tag'>$tag</span>
-			{{ endfor }}
-		</div>
-	</div>
-	
-	<div class="wall-item-bottom" style="display: table-row;">
-		<div class="wall-item-actions">
-	   </div>
-		<div class="wall-item-actions">
-			
-			<div class="wall-item-actions-tools">
-
-				{{ if $drop.dropping }}
-					<input type="checkbox" title="$drop.select" name="itemselected[]" class="item-select" value="$id" />
-					<a href="item/drop/$id" onclick="return confirmDelete();" class="icon drop" title="$drop.delete">$drop.delete</a>
-				{{ endif }}
-				{{ if $edpost }}
-					<a class="icon pencil" href="$edpost.0" title="$edpost.1"></a>
-				{{ endif }}
-			</div>
-
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-			
-	</div>
-</div>
-