Vier: Some templates were missing

diff --git a/.gitignore b/.gitignore
index 358114a44481357fd2f6e4a8bb4f134fcde35b85..038ac32a55b0e4205b3f7b862b12ba3efaee9d3e 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -24,4 +24,11 @@ report/
 #ignore OSX .DS_Store files \r
 .DS_Store\r
 \r
-/nbproject/private/
\ No newline at end of file
+/nbproject/private/\r
+\r
+#ignore smarty cache\r
+/view/smarty3/compiled/\r
+\r
+#ignore cache folders\r
+/privacy_image_cache/\r
+/photo/\r

diff --git a/view/theme/vier/profile_edlink.tpl b/view/theme/vier/profile_edlink.tpl
new file mode 100644 (file)
index 0000000..5bdbb83
--- /dev/null
+++ b/view/theme/vier/profile_edlink.tpl
@@ -0,0 +1 @@
+<div class="clear"></div>

diff --git a/view/theme/vier/smarty3/profile_edlink.tpl b/view/theme/vier/smarty3/profile_edlink.tpl
new file mode 100644 (file)
index 0000000..5bdbb83
--- /dev/null
+++ b/view/theme/vier/smarty3/profile_edlink.tpl
@@ -0,0 +1 @@
+<div class="clear"></div>

diff --git a/view/theme/vier/smarty3/profile_vcard.tpl b/view/theme/vier/smarty3/profile_vcard.tpl
new file mode 100644 (file)
index 0000000..b02a3a5
--- /dev/null
+++ b/view/theme/vier/smarty3/profile_vcard.tpl
@@ -0,0 +1,65 @@
+<div class="vcard">
+
+       <div class="tool">
+               <div class="fn label">{{$profile.name}}</div>
+               {{if $profile.edit}}
+                       <div class="action">
+                       <a class="icon s16 edit ttright" href="#" rel="#profiles-menu" title="{{$profile.edit.3}}"><span>{{$profile.edit.1}}</span></a>
+                       <ul id="profiles-menu" class="menu-popup">
+                               {{foreach $profile.menu.entries as $e}}
+                               <li>
+                                       <a href="profiles/{{$e.id}}"><img src='{{$e.photo}}'>{{$e.profile_name}}</a>
+                               </li>
+                               {{/foreach}}
+                               <li><a href="profile_photo" >{{$profile.menu.chg_photo}}</a></li>
+                               <li><a href="profiles/new" id="profile-listing-new-link">{{$profile.menu.cr_new}}</a></li>
+                               <li><a href="profiles" >{{$profile.edit.3}}</a></li>
+                                                               
+                       </ul>
+                       </div>
+               {{else}}
+                       <div class="profile-edit-side-div"><a class="profile-edit-side-link icon edit" title="{{$editprofile}}" href="profiles/{{$profid}}" ></a></div>
+               {{/if}}
+       </div>
+
+
+       <div id="profile-photo-wrapper"><img class="photo" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}" /></div>
+       {{if $pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}}
+
+
+       {{if $location}}
+               <dl class="location"><dt class="location-label">{{$location}}</dt><br> 
+               <dd class="adr">
+                       {{if $profile.address}}<div class="street-address">{{$profile.address}}</div>{{/if}}
+                       <span class="city-state-zip">
+                               <span class="locality">{{$profile.locality}}</span>{{if $profile.locality}}, {{/if}}
+                               <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>{{/if}}
+               </dd>
+               </dl>
+       {{/if}}
+
+       {{if $gender}}<dl class="mf"><dt class="gender-label">{{$gender}}</dt> <dd class="x-gender">{{$profile.gender}}</dd></dl>{{/if}}
+       
+       {{if $profile.pubkey}}<div class="key" style="display:none;">{{$profile.pubkey}}</div>{{/if}}
+
+       {{if $marital}}<dl class="marital"><dt class="marital-label"><span class="heart">&hearts;</span>{{$marital}}</dt><dd class="marital-text">{{$profile.marital}}</dd></dl>{{/if}}
+
+       {{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>{{/if}}
+
+       {{include file="diaspora_vcard.tpl"}}
+       
+       <div id="profile-extra-links">
+               <ul>
+                       {{if $connect}}
+                               <li><a id="dfrn-request-link" href="dfrn_request/{{$profile.nickname}}">{{$connect}}</a></li>
+                       {{/if}}
+               </ul>
+       </div>
+</div>
+
+{{$contact_block}}
+
+

diff --git a/view/theme/vier/smarty3/wall_thread.tpl b/view/theme/vier/smarty3/wall_thread.tpl
index 07a7a50f85c35977c205a9f01b2f9a331a84e824..386164f18c3ee5341d58ab2e5d387b27ecee82a7 100644 (file)
--- a/view/theme/vier/smarty3/wall_thread.tpl
+++ b/view/theme/vier/smarty3/wall_thread.tpl
@@ -111,7 +111,7 @@
                                 <a href="#" id="filer-{{$item.id}}" onclick="itemFiler({{$item.id}}); return false;" class="filer-item filer-icon" title="{{$item.filer}}"><i class="icon-folder-close icon-large"></i></a>
                        {{/if}}
                        </div>
-                       <div class="wall-item-location">{{$item.location}}</div>                                
+                       <div class="wall-item-location">{{$item.location}} {{$item.postopts}}</div>                             
                        <div class="wall-item-actions-tools">
 
                                {{if $item.drop.pagedrop}}
@@ -128,14 +128,16 @@
                </div>
        </div>
        <div class="wall-item-bottom">
-               <div class="wall-item-links"></div>
+               <div class="wall-item-links">
+               </div>
                <div class="wall-item-like" id="wall-item-like-{{$item.id}}">{{$item.like}}</div>
                <div class="wall-item-dislike" id="wall-item-dislike-{{$item.id}}">{{$item.dislike}}</div>      
        </div>
        
        {{if $item.threaded}}{{if $item.comment}}
        <div class="wall-item-bottom">
-               <div class="wall-item-links"></div>
+               <div class="wall-item-links">
+               </div>
                <div class="wall-item-comment-wrapper" id="item-comments-{{$item.id}}" style="display: none;">
                                        {{$item.comment}}
                </div>