+
+
+
+
+
+ {{ if $pdesc }}
$profile.pdesc
{{ endif }}
+
+
+ {{ 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 }}
$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/vier/smarty3/profile_edlink.tpl b/view/theme/vier/smarty3/profile_edlink.tpl
new file mode 100644
index 000000000..5bdbb834a
--- /dev/null
+++ b/view/theme/vier/smarty3/profile_edlink.tpl
@@ -0,0 +1 @@
+
+
+
+
+
+
+ {{if $pdesc}}
{{$profile.pdesc}}
{{/if}}
+
+
+ {{if $location}}
+
- {{$location}}
+ -
+ {{if $profile.address}}
{{$profile.address}}
{{/if}}
+
+ {{$profile.locality}}{{if $profile.locality}}, {{/if}}
+ {{$profile.region}}
+ {{$profile.postal-code}}
+
+ {{if $profile.country-name}}{{$profile.country-name}}{{/if}}
+
+
+ {{/if}}
+
+ {{if $gender}}
- {{$gender}}
- {{$profile.gender}}
{{/if}}
+
+ {{if $profile.pubkey}}
{{$profile.pubkey}}
{{/if}}
+
+ {{if $marital}}
- ♥{{$marital}}
- {{$profile.marital}}
{{/if}}
+
+ {{if $homepage}}
- {{$homepage}}
- {{$profile.homepage}}
{{/if}}
+
+ {{include file="diaspora_vcard.tpl"}}
+
+
+
+
+{{$contact_block}}
+
+
diff --git a/view/theme/vier/smarty3/wall_thread.tpl b/view/theme/vier/smarty3/wall_thread.tpl
index 07a7a50f8..386164f18 100644
--- a/view/theme/vier/smarty3/wall_thread.tpl
+++ b/view/theme/vier/smarty3/wall_thread.tpl
@@ -111,7 +111,7 @@
-
+
+
diff --git a/view/theme/vier/style.css b/view/theme/vier/style.css
index ffd50ed14..f97fc2f59 100644
--- a/view/theme/vier/style.css
+++ b/view/theme/vier/style.css
@@ -7,6 +7,10 @@
@import url("css/font-awesome.css") all;
@import url("css/font2.css") all;
+img {
+ border: 0px;
+}
+
/* ========= */
/* = Admin = */
/* ========= */
@@ -1067,8 +1071,9 @@ border-bottom: 1px solid #D2D2D2;
text-align: left;
width: 80px;
}
-.wall-item-container .wall-item-location {
- padding-right: 40px;
+.wall-item-container {
+ /* padding-right: 30px; */
+ padding-right: 0px;
}
.wall-item-container .wall-item-ago {
word-wrap: break-word;
@@ -1077,7 +1082,7 @@ border-bottom: 1px solid #D2D2D2;
color: #999;
}
.wall-item-location {
- width: 180px;
+ width: 350px;
float: left;
}
@@ -1253,7 +1258,8 @@ border-bottom: 1px solid #D2D2D2;
#profile-jot-form #profile-jot-text {
height: 2.0em;
- width: 99%;
+ /* width: 99%; */
+ width: 752px;
font-size: 15px;
color: #999999;
border: 1px solid #DDD;
@@ -1267,7 +1273,8 @@ border-bottom: 1px solid #D2D2D2;
font-weight: bold;
height: 20px;
margin: 0 0 5px;
- width: 60%;
+ /* width: 60%; */
+ width: 762px;
border: 1px solid #d2d2d2;
}
@@ -1282,6 +1289,10 @@ border-bottom: 1px solid #D2D2D2;
height: 100px;
}
+#profile-jot-perms {
+ float: right;
+}
+
#jot-preview-content {
padding-top: 25px;
}
@@ -1689,7 +1700,7 @@ div.pager, .birthday-notice, ul.tabs a, #jot-preview-link, .comment-edit-submit-
border: 1px solid lightgray;
color: black;
background: #F2F2F2;
- padding: 3px 7px 2px 7px;
+ padding: 2px 7px 2px 7px;
margin-top: 2px;
margin-bottom: 2px;
@@ -1816,10 +1827,15 @@ div.pager, .birthday-notice, ul.tabs a, #jot-preview-link, .comment-edit-submit-
}
.profile-edit-side-div {
- display: none;
-/* float: right; */
+/* display: none; */
+ float: right;
}
+/* aside div.clear {
+ clear: none;
+ float: left;
+} */
+
#register-form label,
#profile-edit-form label {
width: 300px; float: left;
diff --git a/view/theme/vier/theme.php b/view/theme/vier/theme.php
index 7c0f3d3f8..7da0731f7 100644
--- a/view/theme/vier/theme.php
+++ b/view/theme/vier/theme.php
@@ -8,11 +8,11 @@
* Description: "Vier" uses the font awesome font library: http://fortawesome.github.com/Font-Awesome/
*/
+function vier_init(&$a) {
set_template_engine($a, 'smarty3');
$a->theme_info = array();
-function vier_init(&$a) {
$a->page['htmlhead'] .= <<< EOT