Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
panustaja
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
Operations
Operations
Incidents
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Mihkel Putrinš
panustaja
Commits
faf48d99
Commit
faf48d99
authored
Nov 13, 2015
by
Mihkel Putrinš
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'test'
parents
7beac051
37f25c4d
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
12 deletions
+11
-12
code/panu.js
code/panu.js
+1
-1
code/panu_view.html
code/panu_view.html
+4
-2
code/style.css
code/style.css
+4
-8
code/upload.js
code/upload.js
+2
-1
No files found.
code/panu.js
View file @
faf48d99
...
@@ -101,7 +101,7 @@ var resourceLoaded = function resourceLoaded() {
...
@@ -101,7 +101,7 @@ var resourceLoaded = function resourceLoaded() {
}
}
var
renderResource
=
function
renderResource
()
{
var
renderResource
=
function
renderResource
()
{
console
.
log
(
JSON
.
stringify
(
op
.
get
(
resource_stats
,
'
mime
'
),
null
,
2
))
//
console.log(JSON.stringify(op.get(resource_stats, 'mime'), null, 2))
document
.
getElementById
(
'
resourceStats
'
).
removeAttribute
(
'
hidden
'
)
document
.
getElementById
(
'
resourceStats
'
).
removeAttribute
(
'
hidden
'
)
document
.
getElementById
(
'
resourceDirectories
'
).
innerHTML
=
''
document
.
getElementById
(
'
resourceDirectories
'
).
innerHTML
=
''
document
.
getElementById
(
'
resourceFiles
'
).
innerHTML
=
''
document
.
getElementById
(
'
resourceFiles
'
).
innerHTML
=
''
...
...
code/panu_view.html
View file @
faf48d99
...
@@ -35,12 +35,14 @@
...
@@ -35,12 +35,14 @@
<p
id=
"uploadResourceMessage"
>
Ressurss on üleslaadimiseks valmis.
</p>
<p
id=
"uploadResourceMessage"
>
Ressurss on üleslaadimiseks valmis.
</p>
<button
id=
"uploadResourceButton"
>
Panusta!
</button>
<button
id=
"uploadResourceButton"
>
Panusta!
</button>
</div>
</div>
<div
id=
"uploading"
hidden=
""
>
<span>
Kataloogid:
</span><span
id=
"uploadedResources"
>
0
</span><span>
/
</span><span
id=
"uploadTotalResources"
>
0
</span>
<div
id=
"uploading"
hidden=
""
>
<span>
Kataloogid:
</span><span
id=
"uploadedResources"
>
0
</span><span>
/
</span><span
id=
"uploadTotalResources"
>
0
</span>
<span>
Failid:
</span><span
id=
"uploadedSize"
>
0
</span><span>
/
</span><span
id=
"uploadTotalSize"
>
0
</span>
<div
id=
"resourceProgressbarOuter"
>
<div
id=
"resourceProgressbarOuter"
>
<div
id=
"resourceProgressbarInner"
>
<div
id=
"resourceProgressbarInner"
>
<div
id=
"fileProgressbarInner"
></div>
<div
id=
"fileProgressbarInner"
></div>
</div>
</div>
</div>
<span>
Failid:
</span><span
id=
"uploadedSize"
>
0
</span><span>
/
</span><span
id=
"uploadTotalSize"
>
0
</span>
</div>
<pre
id=
"status"
></pre>
<pre
id=
"status"
></pre>
</div>
</div>
<div
id=
"thankYou"
hidden=
""
>
<div
id=
"thankYou"
hidden=
""
>
...
...
code/style.css
View file @
faf48d99
#resourceProgressbarOuter
{
#resourceProgressbarOuter
{
width
:
100%
;
margin-top
:
0.5em
;
left
:
1em
;
right
:
120px
;
position
:
absolute
;
border-radius
:
25px
;
border-radius
:
25px
;
height
:
9px
;
height
:
9px
;
background-color
:
#E8E8C3
;
background-color
:
#E8E8C3
;
...
@@ -12,13 +15,6 @@
...
@@ -12,13 +15,6 @@
background-color
:
#92CC6F
;
background-color
:
#92CC6F
;
/*border: 0px solid green;*/
/*border: 0px solid green;*/
}
}
#fileProgressbarOuter
{
width
:
100%
;
border-radius
:
25px
;
height
:
9px
;
background-color
:
#cdf
;
border
:
0px
solid
black
;
}
#fileProgressbarInner
{
#fileProgressbarInner
{
width
:
0%
;
width
:
0%
;
border-radius
:
25px
;
border-radius
:
25px
;
...
...
code/upload.js
View file @
faf48d99
...
@@ -84,7 +84,8 @@ var createEntuResource = function createEntuResource(parent_eid, resource, callb
...
@@ -84,7 +84,8 @@ var createEntuResource = function createEntuResource(parent_eid, resource, callb
xhr
.
setRequestHeader
(
"
Content-type
"
,
"
application/x-www-form-urlencoded
"
)
xhr
.
setRequestHeader
(
"
Content-type
"
,
"
application/x-www-form-urlencoded
"
)
xhr
.
setRequestHeader
(
'
X-Auth-UserId
'
,
user_data
[
'
user_id
'
])
xhr
.
setRequestHeader
(
'
X-Auth-UserId
'
,
user_data
[
'
user_id
'
])
xhr
.
setRequestHeader
(
'
X-Auth-Token
'
,
user_data
[
'
session_key
'
])
xhr
.
setRequestHeader
(
'
X-Auth-Token
'
,
user_data
[
'
session_key
'
])
xhr
.
onload
=
function
()
{
xhr
.
onload
=
function
(
err
)
{
if
(
err
)
{
return
callback
(
err
)
}
var
new_eid
=
op
.
get
(
JSON
.
parse
(
this
.
responseText
),
[
'
result
'
,
'
id
'
],
false
)
var
new_eid
=
op
.
get
(
JSON
.
parse
(
this
.
responseText
),
[
'
result
'
,
'
id
'
],
false
)
console
.
log
(
'
Looking for new EID:
'
,
new_eid
)
console
.
log
(
'
Looking for new EID:
'
,
new_eid
)
if
(
new_eid
)
{
if
(
new_eid
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment