aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
Diffstat (limited to 'view')
-rw-r--r--view/cropbody.tpl3
-rw-r--r--view/profile_edit.tpl4
-rw-r--r--view/profile_entry.tpl7
-rw-r--r--view/profile_entry_default.tpl6
-rw-r--r--view/profile_listing_header.tpl2
-rw-r--r--view/profile_photo.tpl2
-rw-r--r--view/register.tpl16
-rw-r--r--view/style.css40
8 files changed, 64 insertions, 16 deletions
diff --git a/view/cropbody.tpl b/view/cropbody.tpl
index 03baf61e7..39395af8e 100644
--- a/view/cropbody.tpl
+++ b/view/cropbody.tpl
@@ -39,9 +39,10 @@ Please adjust the image cropping for optimum viewing.
</script>
-<form action="profile_photo/$profile_id/$resource" id="crop-image-form" method="post" />
+<form action="profile_photo/$resource" id="crop-image-form" method="post" />
<input type="hidden" name="imagename" value="$hash" />
+<input type="hidden" name="cropfinal" value="1" />
<input type="hidden" name="xstart" id="x1" />
<input type="hidden" name="ystart" id="y1" />
<input type="hidden" name="xfinal" id="x2" />
diff --git a/view/profile_edit.tpl b/view/profile_edit.tpl
index 3dcf8df2c..20b9a0993 100644
--- a/view/profile_edit.tpl
+++ b/view/profile_edit.tpl
@@ -2,6 +2,10 @@
<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-drop-link-wrapper" ><a href="profiles/drop/$profile_id" id="profile-edit-drop-link" title="Delete this profile" $disabled >Delete this profile</a></div>
+
+<div id="profile-edit-links-end"></div>
+
$default
<div id="profile-edit-wrapper" >
diff --git a/view/profile_entry.tpl b/view/profile_entry.tpl
index 9b3be79d3..db28c0a8f 100644
--- a/view/profile_entry.tpl
+++ b/view/profile_entry.tpl
@@ -1,13 +1,10 @@
<div class="profile-listing" >
<div class="profile-listing-photo-wrapper" >
-<a class="profile-listing-photo-edit-link" id="profile-listing-photo-edit-link-$id" title="Edit/Change Profile Photo" href="profile_photo/$id" ><img class="profile-listing-photo" id="profile-listing-photo-$id" src="$photo" alt="Profile Image" /></a>
+<a href="profiles/$id" class="profile-listing-edit-link"><img class="profile-listing-photo" id="profile-listing-photo-$id" src="$photo" alt="Profile Image" /></a>
</div>
+<div class="profile-listing-photo-end"></div>
<div class="profile-listing-name" id="profile-listing-name-$id">$profile_name</div>
-<div class="profile-listing-edit-buttons-wrapper" id="profile-listing-edit-buttons-wrapper-$id">
-<a href="profiles/$id" class="profile-listing-edit-link" ><img src="images/b_edit.gif" alt="Edit Profile" title="Edit Profile" /></a>
-<a href="profiles/drop/$id" class="profile-listing-drop-link" ><img src="images/b_drop.gif" alt="Delete Profile" title="Delete Profile" /></a>
-</div>
</div>
<div class="profile-listing-end"></div>
diff --git a/view/profile_entry_default.tpl b/view/profile_entry_default.tpl
index bd74b9c54..e9bceba89 100644
--- a/view/profile_entry_default.tpl
+++ b/view/profile_entry_default.tpl
@@ -1,11 +1,9 @@
<div class="profile-listing" >
<div class="profile-listing-photo-wrapper" >
-<a class="profile-listing-photo-edit-link" id="profile-listing-photo-edit-link-$id" title="Edit/Change Profile Photo" href="profile_photo/$id" ><img class="profile-listing-photo" id="profile-listing-photo-$id" src="$photo" alt="Profile Image" /></a>
+<a href="profiles/$id" class="profile-listing-edit-link" ><img class="profile-listing-photo" id="profile-listing-photo-$id" src="$photo" alt="Profile Image" /></a>
</div>
+<div class="profile-listing-photo-end" ></div>
<div class="profile-listing-name" id="profile-listing-name-$id">$profile_name</div>
-<div class="profile-listing-edit-buttons-wrapper" id="profile-listing-edit-buttons-wrapper-$id">
-<a href="profiles/$id" class="profile-listing-edit-link" ><img src="images/b_edit.gif" alt="Edit Profile" title="Edit Profile" /></a>
-</div>
</div>
<div class="profile-listing-end"></div>
diff --git a/view/profile_listing_header.tpl b/view/profile_listing_header.tpl
index ce052658d..d4b139a69 100644
--- a/view/profile_listing_header.tpl
+++ b/view/profile_listing_header.tpl
@@ -1,6 +1,6 @@
<h1>Profiles</h1>
<p id="profile-listing-desc" >
-Click photo to change profile image or use controls to edit/delete profile details.
+<a href="profile_photo" >Change profile photo</a>
</p>
<div id="profile-listing-new-link-wrapper" >
<a href="profiles/new" id="profile-listing-new-link" name="Create New Profile" >Create New Profile</a>
diff --git a/view/profile_photo.tpl b/view/profile_photo.tpl
index 0bd5d7b1b..d518e7331 100644
--- a/view/profile_photo.tpl
+++ b/view/profile_photo.tpl
@@ -1,6 +1,6 @@
<h1>Upload Profile Photo</h1>
-<form enctype="multipart/form-data" action="profile_photo/$profile_id" method="post">
+<form enctype="multipart/form-data" action="profile_photo" method="post">
<div id="profile-photo-upload-wrapper">
<label id="profile-photo-upload-label" for="profile-photo-upload">Upload File: </label>
diff --git a/view/register.tpl b/view/register.tpl
index 30cc1ca1f..9b78d47eb 100644
--- a/view/register.tpl
+++ b/view/register.tpl
@@ -1,3 +1,4 @@
+<h3>Registration</h3>
<form action="register" method="post" >
$registertext
@@ -6,11 +7,26 @@
<input type="text" maxlength="60" size="32" name="username" id="register-name" value="" >
</div>
<div id="register-name-end" ></div>
+
+
<div id="register-email-wrapper" >
<label for="register-email" id="label-register-email" >Your Email Address: </label>
<input type="text" maxlength="60" size="32" name="email" id="register-email" value="" >
</div>
<div id="register-email-end" ></div>
+
+ <p id="register-nickname-desc" >
+ You will use a unique nickname to identify yourself in our social network. This must begin with a text character.
+ Your profile identifier will then be '<strong>nickname@$sitename</strong>'.
+ </p>
+ <div id="register-nickname-wrapper" >
+ <label for="register-nickname" id="label-register-nickname" >Choose a nickname: </label>
+ <input type="text" maxlength="60" size="32" name="nickname" id="register-nickname" value="" ><div id="register-sitename">@$sitename</div>
+ </div>
+ <div id="register-nickname-end" ></div>
+
+
+
<div id="register-submit-wrapper">
<input type="submit" name="submit" id="register-submit-button" value="Register" />
</div>
diff --git a/view/style.css b/view/style.css
index a8f1abb13..128464b1d 100644
--- a/view/style.css
+++ b/view/style.css
@@ -102,24 +102,32 @@ footer {
margin-right: 20px;
}
-#label-register-name, #label-register-email {
+#label-register-name, #label-register-email, #label-register-nickname {
float: left;
width: 350px;
margin-top: 10px;
}
-#register-name, #register-email {
+#register-name, #register-email, #register-nickname {
float: left;
margin-top: 10px;
width: 150px;
}
-#register-name-end, #register-email-end, #register-submit-end {
+#register-name-end, #register-email-end, #register-nickname-end, #register-submit-end {
clear: both;
}
+#register-nickname-desc {
+ margin-top: 30px;
+ width: 650px;
+}
+#register-sitename {
+ float: left;
+ margin-top: 10px;
+}
#register-submit-button {
- margin-top: 10px;
+ margin-top: 50px;
margin-left: 350px;
}
@@ -275,8 +283,22 @@ input#dfrn-url {
}
#profile-edit-clone-link-wrapper {
+ float: left;
margin-left: 50px;
margin-bottom: 20px;
+ width: 300px;
+}
+
+#profile-edit-drop-link-wrapper {
+ float: left;
+
+}
+
+#profile-edit-links-end {
+ clear: both;
+}
+.profile-listing-photo {
+ border: none;
}
.profile-edit-submit-wrapper {
@@ -494,7 +516,12 @@ input#dfrn-url {
margin-bottom: 30px;
}
+#profile-listing-desc {
+ margin-left: 30px;
+}
+
#profile-listing-new-link-wrapper {
+ margin-left: 30px;
margin-bottom: 30px;
}
.profile-listing-photo-wrapper {
@@ -520,7 +547,12 @@ input#dfrn-url {
}
.profile-listing-name {
float: left;
+ margin-left: 32px;
margin-top: 10px;
+ color: #3172BD;
+ font-weight: bold;
+ width: 200px;
+
}
.fortune {
margin-top: 50px;