profile editor cleanups

diff --git a/mod/profile.php b/mod/profile.php
index b63ec72508ee8bd44176cd8634dcb064b5e6c299..07c5357ff8026bfc3c3770b979ab931c83b7bba9 100644 (file)
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -57,7 +57,12 @@ function profile_init(&$a) {
                        unset($_SESSION['authenticated']);
        }
 
-       profile_load($a,$which);
+       $profile = 0;
+       if((local_user()) && ($a->argc > 2) && ($a->argv[2] == 'view')) {
+               $which = $a->user['nickname'];
+               $profile = $a->argv[1];         
+       }
+       profile_load($a,$which,$profile);
        $a->page['htmlhead'] .= "<meta name=\"dfrn-template\" content=\"" . $a->get_baseurl() . "/profile/%s" . "\" />\r\n";
        
        $dfrn_pages = array('request', 'confirm', 'notify', 'poll');

diff --git a/view/profile_edit.tpl b/view/profile_edit.tpl
index 20b9a0993e5a636e9d7029f3f4d3d8505f549296..44ca3922b86cf199b17668f3da63938557c1dac0 100644 (file)
--- a/view/profile_edit.tpl
+++ b/view/profile_edit.tpl
@@ -1,8 +1,14 @@
 <h1>Edit Profile Details</h1>
 
-<div id="profile-edit-clone-link-wrapper" ><a href="profiles/clone/$profile_id" id="profile-edit-clone-link" title="Create a new profile using these settings">Clone this profile</a></div>
+<div id="profile-edit-links">
+<ul>
+<li><a href="profile/$profile_id/view" id="profile-edit-view-link" title="View this profile">View this profile</a></li>
+<li><a href="profiles/clone/$profile_id" id="profile-edit-clone-link" title="Create a new profile using these settings">Clone this profile</a></li>
+<li></li>
+<li><a href="profiles/drop/$profile_id" id="profile-edit-drop-link" title="Delete this profile" $disabled >Delete this profile</a></li>
 
-<div id="profile-edit-drop-link-wrapper" ><a href="profiles/drop/$profile_id" id="profile-edit-drop-link" title="Delete this profile" $disabled >Delete this profile</a></div>
+</ul>
+</div>
 
 <div id="profile-edit-links-end"></div>
 
@@ -36,6 +42,8 @@ $dob $age
 </div>
 <div id="profile-edit-dob-end"></div>
 
+$profile_in_dir
+
 $hide_friends
 
 <div class="profile-edit-submit-wrapper" >
@@ -118,10 +126,6 @@ $sexual
 </div>
 <div id="profile-edit-religion-end"></div>
 
-
-$profile_in_dir
-
-
 <div class="profile-edit-submit-wrapper" >
 <input type="submit" name="submit" class="profile-edit-submit-button" value="Submit" />
 </div>

diff --git a/view/style.css b/view/style.css
index fa0f948bb0c1a728b1c3915b73fcc6c21525765a..8b67be08c888ae4944cbbc5d03a3b7c783d0a873 100644 (file)
--- a/view/style.css
+++ b/view/style.css
@@ -300,10 +300,19 @@ input#dfrn-url {
        list-style-type: none;
 }
 
+
 #profile-extra-links li {
        margin-top: 5px;
 }
 
+#profile-edit-links ul {
+       list-style-type: none;
+}
+
+#profile-edit-links li {
+       margin-top: 10px;
+}
+
 .view-contact-wrapper {
        margin-top: 20px;
        float: left;