Merge pull request #681 from pafcu/master

New layout for directory

3 files changed, 47 insertions, 50 deletions

diff --git a/view/css/mod_directory.css b/view/css/mod_directory.css
index bc8054937..98b99ef50 100644
--- a/view/css/mod_directory.css
+++ b/view/css/mod_directory.css
@@ -8,15 +8,17 @@
 .directory-photo {
 	margin-left: 25px;
 }
+.directory-photo-img {
+	margin-left: auto;
+	margin-right: auto;
+	display:block;
+}
 .directory-details {
 	text-align: center;
 	margin-left: 5px;
 	margin-right: 5px;
 }
 .directory-item {
-	float: left;
-	width: 225px;
-	height: 260px;
 	overflow: hidden;
 	margin: 2px;
 }
@@ -42,3 +44,26 @@ div.dirtagblock.widget {
 	float: left;
 	width: 225px;
 }
+
+.contact-photo {
+	float: left;
+	margin-right: 16px;
+}
+
+.contact-name {
+	font-size: larger;
+}
+
+.contact-info {
+	display: block;
+	overflow: hidden;
+}
+
+.directory-item {
+	margin: 16px;
+}
+.directory-connect {
+	display:block;
+	margin-left:auto;
+	margin-right: auto;
+}
diff --git a/view/tpl/direntry.tpl b/view/tpl/direntry.tpl
index a6252bb9a..691905ecd 100755
--- a/view/tpl/direntry.tpl
+++ b/view/tpl/direntry.tpl
@@ -3,12 +3,27 @@
 <div class="contact-photo-wrapper" id="directory-photo-wrapper-{{$entry.id}}" >
 <div class="contact-photo" id="directory-photo-{{$entry.id}}" >
 <a href="{{$entry.profile_link}}" class="directory-profile-link" id="directory-profile-link-{{$entry.id}}" ><img class="directory-photo-img" src="{{$entry.photo}}" alt="{{$entry.alttext}}" title="{{$entry.alttext}}" /></a>
-</div>
-</div>
-
-<div class="contact-name" id="directory-name-{{$entry.id}}"  ><span onclick="dirdetails('{{$entry.hash}}');" class="fakelink" >{{$entry.name}}</span></div>
 {{if $entry.connect}}
 <div class="directory-connect btn btn-default"><a href="{{$entry.connect}}"><i class="icon-plus connect-icon"></i> {{$entry.conn_label}}</a></div>
 {{/if}}
+</div>
+</div>
+
+<div class='contact-info'>
+<div class="contact-name" id="directory-name-{{$entry.id}}"  ><a href='{{$entry.profile_link}}' >{{$entry.name}}</a>{{if $entry.online}} <i class="icon-asterisk online-now" title="{{$entry.online}}"></i>{{/if}}</div>
+
 <div class="contact-details">{{$entry.details}}</div>
+{{if $entry.hometown}}
+<div class="directory-hometown">{{$entry.hometown}} </div>
+{{/if}}
+{{if $entry.about}}
+<div class="directory-about">{{$entry.about}} </div>
+{{/if}}
+{{if $entry.homepage}}
+<div class="directory-homepage">{{$entry.homepage}}<a href='{{$entry.homepageurl}}'>{{$entry.homepageurl}}</a> </div>
+{{/if}}
+{{if $entry.kw}}
+<div class="directory-keywords">{{$entry.kw}} {{$entry.keywords}}</div>
+{{/if}}
+</div>
 </div>
diff --git a/view/tpl/direntry_large.tpl b/view/tpl/direntry_large.tpl
deleted file mode 100755
index da6ea1a44..000000000
--- a/view/tpl/direntry_large.tpl
+++ /dev/null
@@ -1,43 +0,0 @@
-<div class="directory-popup-item lframe" id="directory-item-{{$id}}" >
-<div class="generic-content-wrapper">
-
-<div class="contact-photo-wrapper" id="directory-photo-wrapper-{{$id}}" >
-	<div class="contact-photo dirpopup" id="directory-photo-{{$id}}" >
-	<a href="{{$profile_link}}" class="directory-profile-link" id="directory-profile-link-{{$id}}" ><img class="directory-photo-img" style="height:175px; width:175px;" src="{{$photo}}" alt="{{$alttext}}" title="{{$alttext}}" /></a>
-	</div>
-	<div class="contact-photo dirpopup" id="directory-qr-{{$id}}" >
-	<img class="directory-photo-img" style="height:175px; width:175px;" src="photo/qr?f=&qr={{$qrlink}}" alt="QR" title="{{$qrlink}}" />
-	</div>
-</div>
-
-<div class="clear"></div>
-
-
-<div class="contact-name" id="directory-name-{{$id}}"  >{{$name}}{{if $online}} <i class="icon-asterisk online-now" title="{{$online}}"></i>{{/if}}</div>
-{{if $connect}}
-<div class="directory-connect btn btn-default"><a href="{{$connect}}"><i class="icon-plus connect-icon"></i> {{$conn_label}}</a></div>
-{{/if}}
-
-<div class="contact-webbie">{{$address}}</div>
-
-<div class="contact-details">{{$details}}</div>
-{{if $marital}}
-<div class="directory-marital">{{$marital}} </div>
-{{/if}}
-{{if $sexual}}
-<div class="directory-sexual">{{$sexual}} </div>
-{{/if}}
-{{if $homepage}}
-<div class="directory-homepage">{{$homepage}} </div>
-{{/if}}
-{{if $hometown}}
-<div class="directory-hometown">{{$hometown}} </div>
-{{/if}}
-{{if $about}}
-<div class="directory-about">{{$about}} </div>
-{{/if}}
-{{if $kw}}
-<div class="directory-keywords">{{$kw}} {{$keywords}}</div>
-{{/if}}
-</div>
-</div>