progress on photos

5 files changed, 126 insertions, 2 deletions

diff --git a/view/photo_album.tpl b/view/photo_album.tpl
new file mode 100644
index 000000000..323a9cdff
--- /dev/null
+++ b/view/photo_album.tpl
@@ -0,0 +1,5 @@
+
+<div class="photo-album-image-wrapper" id="photo-album-image-wrapper-$id">
+	<a href="$photolink" class="photo-album-photo-link" id="photo-album-photo-link-$id" title="$phototitle"><img src="$imgsrc" alt="$imgalt" title="$phototitle" class="photo-album-photo" id="photo-album-photo-$id" /></a>
+</div>
+<div class="photo-album-image-wrapper-end"></div>
diff --git a/view/photo_top.tpl b/view/photo_top.tpl
new file mode 100644
index 000000000..e2ebb6fd5
--- /dev/null
+++ b/view/photo_top.tpl
@@ -0,0 +1,6 @@
+
+<div class="photo-top-image-wrapper" id="photo-top-image-wrapper-$id">
+	<a href="$photolink" class="photo-top-photo-link" id="photo-top-photo-link-$id" title="$phototitle"><img src="$imgsrc" alt="$imgalt" title="$phototitle" class="photo-top-photo" id="photo-top-photo-$id" /></a>
+	<div class="photo-top-album-name"><a href="$albumlink" class="photo-top-album-link" title="$albumalt" >$albumname</a></div>
+</div>
+<div class="photo-top-image-wrapper-end"></div>
diff --git a/view/photos_upload.tpl b/view/photos_upload.tpl
new file mode 100644
index 000000000..36e1780d5
--- /dev/null
+++ b/view/photos_upload.tpl
@@ -0,0 +1,53 @@
+<h3>$pagename</h3>
+<form action="photos" enctype="multipart/form-data" method="post" name="photos-upload-form" id="photos-upload-form" >
+	<div id="photos-upload-new-wrapper" >
+		<div id="photos-upload-newalbum-div">
+			<label id="photos-upload-newalbum-text" for="photos-upload-newalbum" >$newalbum</label>
+		</div>
+		<input id="photos-upload-newalbum" type="text" name="newalbum" />
+	</div>
+	<div id="photos-upload-new-end"></div>
+	<div id="photos-upload-exist-wrapper">
+		<div id="photos-upload-existing-album-text">$existalbumtext</div>
+		$albumselect
+	</div>
+	<div id="photos-upload-exist-end"></div>
+
+	<div id="photos-upload-select-files-text">$filestext</div>
+
+	<div id="photos_upload_applet_wrapper">
+		<applet name="jumpLoaderApplet"
+			code="jmaster.jumploader.app.JumpLoaderApplet.class"
+			archive="$archive"
+			width="700"
+			height="600"
+			mayscript >
+			<param name="uc_uploadUrl" value="$uploadurl" />
+			<param name="uc_uploadFormName" value="photos-upload-form" />
+			<param name="gc_loggingLeveL" value="FATAL" />
+			<param name="uc_fileParameterName" value="userfile" />
+			<param name="uc_cookie" value="PHPSESSID=$sessid; path=/;" />
+			<param name="vc_disableLocalFileSystem" value="false" />
+			<param name="vc_uploadViewMenuBarVisible" value="false" />
+			<param name="vc_mainViewFileListViewVisible" value="true" />
+			<param name="vc_mainViewFileListViewHeightPercent" value="50" />
+			<param name="vc_mainViewFileTreeViewVisible" value="true" />
+			<param name="vc_mainViewFileTreeViewWidthPercent" value="35" />
+			<param name="vc_lookAndFeel" value="system" />
+	
+		</applet>
+		
+	</div>
+
+	<div id="photos-upload-no-java-message" >
+	$nojava
+	</div>	
+
+	<input type="file" name="userfile" />
+
+	<div class="photos-upload-submit-wrapper" >
+		<input type="submit" name="submit" value="$submit" id="photos-upload-submit" />
+	</div>
+	<div class="photos-upload-end" ></div>
+</form>
+
diff --git a/view/profile_tabs.tpl b/view/profile_tabs.tpl
index bb459a2c2..0877edd73 100644
--- a/view/profile_tabs.tpl
+++ b/view/profile_tabs.tpl
@@ -2,5 +2,5 @@
 <div id="profile-tabs-wrapper" >
 	<a href="$url" id="profile-tab-status-link" class="profile-tabs" >Status</a>
 	<a href="$url?tab=profile" id="profile-tab-profile-link" class="profile-tabs" >Profile</a>
-	<a href="$url?tab=photos" id="profile-tab-photos-link" class="profile-tabs" >Photos</a>
+	<a href="$phototab" id="profile-tab-photos-link" class="profile-tabs" >Photos</a>
 <div id="profile-tabs-end"></div>
diff --git a/view/style.css b/view/style.css
index ba5e55e6f..77f3d12c9 100644
--- a/view/style.css
+++ b/view/style.css
@@ -1217,4 +1217,64 @@ input#dfrn-url {
 }
 
 #sidebar-group-list li {
-	margin-top: 10px;
\ No newline at end of file
+	margin-top: 10px;
+}
+
+.photo-album-image-wrapper {
+	float: left;
+	margin-top: 15px;
+	height: 350px;
+	width: 350px;
+}
+
+#photo-album-end {
+	clear: both;
+}
+
+.photo-top-image-wrapper {
+	float: left;
+	margin-top: 15px;
+	height: 350px;
+	width: 350px;
+}
+
+#photo-top-end {
+	clear: both;
+}
+
+#photo-top-links {
+	margin-bottom: 30px;
+	margin-left: 30px;
+}
+
+#photos-upload-newalbum-div {
+	float: left;
+	width: 175px;
+}
+#photos-upload-existing-album-text {
+	float: left;
+	width: 175px;
+}
+#photos-upload-newalbum {
+	float: left;
+}
+#photos-upload-album-select {
+	float: left;
+}
+#photos-upload-new-end, #photos-upload-exist-end {
+	clear: both;
+}
+#photos-upload-exist-end {
+	margin-bottom: 15px;
+}
+#photos-upload-submit {
+	margin-top: 15px;
+}
+
+#photos_upload_applet_wrapper {
+	margin-bottom: 15px;
+}
+
+#photos-upload-no-java-message {
+	margin-bottom: 15px;
+}
\ No newline at end of file