diff --git a/.gitignore b/.gitignore index cbdf03673b..3dfb8a903a 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,5 @@ include/jquery-1.4.2.min.js favicon.* home.html addon +*~ + diff --git a/view/theme/dispy/nav.tpl b/view/theme/dispy/nav.tpl index d1a396f998..f84f492921 100644 --- a/view/theme/dispy/nav.tpl +++ b/view/theme/dispy/nav.tpl @@ -1,56 +1,57 @@ -$langselector + diff --git a/view/theme/dispy/profile_vcard.tpl b/view/theme/dispy/profile_vcard.tpl new file mode 100644 index 0000000000..b3f5cc50d6 --- /dev/null +++ b/view/theme/dispy/profile_vcard.tpl @@ -0,0 +1,47 @@ +
+ +
$profile.name
+ + + + {{ if $pdesc }}
$profile.pdesc
{{ endif }} +
$profile.name
+ + + + {{ if $location }} +
$location
+
+ {{ if $profile.address }}
$profile.address
{{ endif }} + + $profile.locality{{ if $profile.locality }}, {{ endif }} + $profile.region + $profile.postal-code + + {{ if $profile.country-name }}$profile.country-name{{ endif }} +
+
+ {{ endif }} + + {{ if $gender }}
$gender
$profile.gender
{{ endif }} + + {{ if $profile.pubkey }}{{ endif }} + + {{ if $marital }}
♥$marital
$profile.marital
{{ endif }} + + {{ if $homepage }}
$homepage
$profile.homepage
{{ endif }} + + {{ inc diaspora_vcard.tpl }}{{ endinc }} + + +
+ +$contact_block + + diff --git a/view/theme/dispy/wall_item.tpl b/view/theme/dispy/wall_item.tpl index 4b8dd571b2..1f5cbcaeb3 100644 --- a/view/theme/dispy/wall_item.tpl +++ b/view/theme/dispy/wall_item.tpl @@ -19,10 +19,16 @@
$lock
+ {{ if $star }} + + {{ endif }} $vote - $plink + {{ if $plink }} +
+ {{ endif }} $edpost $drop +
$title
diff --git a/view/theme/dispy/wallwall_item.tpl b/view/theme/dispy/wallwall_item.tpl index 4fe677ab4d..add2cd5a09 100644 --- a/view/theme/dispy/wallwall_item.tpl +++ b/view/theme/dispy/wallwall_item.tpl @@ -24,8 +24,13 @@
$lock
+ {{ if $star }} + + {{ endif }} $vote - $plink + {{ if $plink }} +
+ {{ endif }} $edpost $drop
diff --git a/view/theme/duepuntozero/wall_item.tpl b/view/theme/duepuntozero/wall_item.tpl index 5c467a1193..a4508b067c 100644 --- a/view/theme/duepuntozero/wall_item.tpl +++ b/view/theme/duepuntozero/wall_item.tpl @@ -32,9 +32,13 @@
$vote - $plink + {{ if $plink }} +
+ {{ endif }} $edpost - $star + {{ if $star }} + + {{ endif }} $drop
diff --git a/view/theme/duepuntozero/wallwall_item.tpl b/view/theme/duepuntozero/wallwall_item.tpl new file mode 100644 index 0000000000..daad6ad149 --- /dev/null +++ b/view/theme/duepuntozero/wallwall_item.tpl @@ -0,0 +1,59 @@ +
+
+
+
+ + $owner_name +
+
$wall
+
+ + $name + menu +
+
    + $item_photo_menu +
+
+ +
+
+
+ $lock +
$location
+
+
+
+ $name $to $owner_name $vwall
+
$ago
+
+
+
$title
+
+
$body
+
+
+ $vote + {{ if $plink }} +
+ {{ endif }} + $edpost + {{ if $star }} + + {{ endif }} + $drop +
+
+
+
$like
+
$dislike
+
+
+ $comment +
+ +
+
+ diff --git a/view/theme/loozah/wall_item.tpl b/view/theme/loozah/wall_item.tpl new file mode 100644 index 0000000000..a4508b067c --- /dev/null +++ b/view/theme/loozah/wall_item.tpl @@ -0,0 +1,53 @@ +
+
+
+
+ + $name + + menu +
+
    + $item_photo_menu +
+
+
+
+
+ $lock +
$location
+
+
+
+ $name +
$ago
+ +
+
+
$title
+
+
$body
+
+
+ $vote + {{ if $plink }} +
+ {{ endif }} + $edpost + {{ if $star }} + + {{ endif }} + $drop +
+
+
+
$like
+
$dislike
+
+ $comment +
+ +
+
diff --git a/view/theme/loozah/wallwall_item.tpl b/view/theme/loozah/wallwall_item.tpl new file mode 100644 index 0000000000..daad6ad149 --- /dev/null +++ b/view/theme/loozah/wallwall_item.tpl @@ -0,0 +1,59 @@ +
+
+
+
+ + $owner_name +
+
$wall
+
+ + $name + menu +
+
    + $item_photo_menu +
+
+ +
+
+
+ $lock +
$location
+
+
+
+ $name $to $owner_name $vwall
+
$ago
+
+
+
$title
+
+
$body
+
+
+ $vote + {{ if $plink }} +
+ {{ endif }} + $edpost + {{ if $star }} + + {{ endif }} + $drop +
+
+
+
$like
+
$dislike
+
+
+ $comment +
+ +
+
+