Merge remote-tracking branch 'upstream/master'

4 files changed, 43 insertions, 17 deletions

diff --git a/view/css/mod_profile_photo.css b/view/css/mod_profile_photo.css
new file mode 100644
index 000000000..5540b5fae
--- /dev/null
+++ b/view/css/mod_profile_photo.css
@@ -0,0 +1,12 @@
+.form-label {
+	margin-bottom: 15px;
+	float: left;
+	width: 150px;
+}
+.form-input {
+	margin-bottom: 15px;
+}
+
+#profile-photo-submit-wrapper {
+	clear: both;
+}
\ No newline at end of file
diff --git a/view/tpl/directory_header.tpl b/view/tpl/directory_header.tpl
index 1f03540f2..e1def851b 100644
--- a/view/tpl/directory_header.tpl
+++ b/view/tpl/directory_header.tpl
@@ -1,16 +1,16 @@
-<h1>$sitedir</h1>
+<h1>$dirlbl</h1>
 
-$globaldir
-$admin
+{{ if $search }}
+<h4>$finddsc $safetxt</h4> 
+{{ endif }}
 
-$finding
+{{for $entries as $entry}}
 
-<div id="directory-search-wrapper">
-<form id="directory-search-form" action="directory" method="get" >
-<span class="dirsearch-desc">$desc</span>
-<input type="text" name="search" id="directory-search" class="search-input" onfocus="this.select();" value="$search" />
-<input type="submit" name="submit" id="directory-search-submit" value="$submit" class="button" />
-</form>
-</div>
-<div id="directory-search-end"></div>
+{{ inc direntry.tpl }}{{ endinc }}
+
+{{ endfor }}
+
+
+
+<div class="directory-end"></div>
 
diff --git a/view/tpl/direntry.tpl b/view/tpl/direntry.tpl
new file mode 100644
index 000000000..e860da41c
--- /dev/null
+++ b/view/tpl/direntry.tpl
@@ -0,0 +1,11 @@
+
+<div class="directory-item lframe" id="directory-item-$entry.id" >
+	<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">$entry.name</div>
+	<div class="contact-details">$entry.details</div>
+</div>
diff --git a/view/tpl/profile_photo.tpl b/view/tpl/profile_photo.tpl
index 04ee8f916..282e890c8 100644
--- a/view/tpl/profile_photo.tpl
+++ b/view/tpl/profile_photo.tpl
@@ -4,20 +4,23 @@
 <input type='hidden' name='form_security_token' value='$form_security_token'>
 
 <div id="profile-photo-upload-wrapper">
-<label id="profile-photo-upload-label" for="profile-photo-upload">$lbl_upfile </label>
-<input name="userfile" type="file" id="profile-photo-upload" size="48" />
-</div>
 
-<label id="profile-photo-profiles-label" for="profile-photo-profiles">$lbl_profiles </label>
-<select name="profile" id="profile-photo-profiles" />
+<label id="profile-photo-upload-label" class="form-label" for="profile-photo-upload">$lbl_upfile</label>
+<input name="userfile" class="form-input" type="file" id="profile-photo-upload" size="48" />
+<div class="clear"></div>
+
+<label id="profile-photo-profiles-label" class="form-label" for="profile-photo-profiles">$lbl_profiles</label>
+<select name="profile" id="profile-photo-profiles" class="form-input" >
 {{ for $profiles as $p }}
 <option value="$p.id" {{ if $p.default }}selected="selected"{{ endif }}>$p.name</option>
 {{ endfor }}
 </select>
+<div class="clear"></div>
 
 <div id="profile-photo-submit-wrapper">
 <input type="submit" name="submit" id="profile-photo-submit" value="$submit">
 </div>
+</div>
 
 </form>