Skip to content
This repository was archived by the owner on Sep 10, 2021. It is now read-only.

Commit 3e9b709

Browse files
author
Charles Marion
committed
ENH: style upload
1 parent b12c97e commit 3e9b709

File tree

5 files changed

+21
-11
lines changed

5 files changed

+21
-11
lines changed

application/views/community/view.phtml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,7 @@ $this->headScript()->appendFile($this->webroot.'/public/js/common/common.browser
8585
<div class="viewSideBar">
8686
<div class="sideElementFirst genericAction">
8787
<h1>Actions</h1>
88-
<ul>
89-
<li>To do</li>
90-
</ul>
88+
9189
</div>
9290
<div class="sideElement genericCommunities">
9391
<h1><?php echo $this->t('Members')?></h1>
@@ -97,7 +95,7 @@ $this->headScript()->appendFile($this->webroot.'/public/js/common/common.browser
9795
</div>
9896
<div class="sideElementLast genericStats">
9997
<h1>Stats</h1>
100-
Todo
98+
10199
</div>
102100

103101
<div class="sideElementFirst viewAction">

application/views/upload/simpleupload.phtml

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,30 @@
2828
</ul>
2929
<div id="uploadTabs-1">
3030
<form id="form1" action="index.php" method="post" enctype="multipart/form-data">
31+
<b>Step 1: Select the files</b>
32+
<br/>
3133
<span id="spanButtonPlaceHolder"></span>
3234
<div>
3335
<div class="fieldset flash" id="fsUploadProgress">
3436
</div>
35-
</div>
37+
</div>
38+
<b>Step 2: Select the privacy of these files</b>
39+
<br/>
3640
<select class="privacyUpload">
3741
<option value="public">Public</option>
3842
<option value="private">Private</option>
3943
</select>
44+
<br/>
45+
<b>Step 3: Start the upload</b>
46+
<br/>
4047
<input id="btnCancel" style="display:none;" type="button" value="Cancel All Uploads" onclick="swfu.cancelQueue();" disabled="disabled" style="margin-left: 2px; font-size: 8pt; height: 29px;" />
48+
49+
<span id="btnStartUpload" >
50+
<a href="#" onclick="swfu.startUpload();">
51+
Start Upload
52+
</a>
53+
</span>
54+
4155
</form>
4256
</div>
4357
<div id="uploadTabs-3">

application/views/user/userpage.phtml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,7 @@ $this->headScript()->appendFile($this->webroot.'/public/js/common/common.browser
8686
<div class="viewSideBar">
8787
<div class="sideElementFirst genericAction">
8888
<h1>Actions</h1>
89-
<ul>
90-
<li>To do</li>
91-
</ul>
89+
9290
</div>
9391
<div class="sideElement genericCommunities">
9492
<h1>Communities</h1>
@@ -103,7 +101,7 @@ $this->headScript()->appendFile($this->webroot.'/public/js/common/common.browser
103101
</div>
104102
<div class="sideElementLast genericStats">
105103
<h1>Stats</h1>
106-
Todo
104+
107105
</div>
108106

109107
<div class="sideElementFirst viewAction">

public/js/swfupload/js/handlers.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ function fileDialogComplete(numFilesSelected, numFilesQueued) {
7676
}
7777

7878
/* I want auto start the upload and I can do that here */
79-
this.startUpload();
79+
//this.startUpload();
8080
} catch (ex) {
8181
this.debug(ex);
8282
}

public/js/upload/upload.simpleupload.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
function uploadPreStart(file)
4545
{
4646
swfu.setPostParams({"sid" : $('.sessionId').val(),"privacy": $('.privacyUpload').val() });
47-
uploadStart(file);
47+
//uploadStart(file);
4848
}
4949

5050

0 commit comments

Comments
 (0)