rev330, Early worker exit on file download bugfix, Reload only on py file changes, Modify wrapper render to allow content edit for plugins, File send action without sending header, Rename Sidebar to Fixbutton (it will be separate plugin), Fixbutton font and layout fix on OSX/Safari, Notifications fix on OSX/Safari
This commit is contained in:
parent
d331eea384
commit
cd04abe521
12 changed files with 164 additions and 134 deletions
|
@ -9,7 +9,7 @@ body {
|
||||||
background-color: #323C4D; font-family: "Segoe UI", Helvetica, Arial; font-weight: lighter;
|
background-color: #323C4D; font-family: "Segoe UI", Helvetica, Arial; font-weight: lighter;
|
||||||
font-size: 22px; color: #333; letter-spacing: 1px; color: white; overflow: hidden;
|
font-size: 22px; color: #333; letter-spacing: 1px; color: white; overflow: hidden;
|
||||||
}
|
}
|
||||||
.login { left: 50%; position: absolute; top: 50%; transform: translateX(-50%) translateY(-50%); width: 100%; max-width: 370px; text-align: center; }
|
.login { left: 50%; position: absolute; top: 50%; transform: translateX(-50%) translateY(-50%); -webkit-transform: translateX(-50%) translateY(-50%); width: 100%; max-width: 370px; text-align: center; }
|
||||||
|
|
||||||
*:focus { outline: 0; }
|
*:focus { outline: 0; }
|
||||||
input[type=text], input[type=password] {
|
input[type=text], input[type=password] {
|
||||||
|
@ -66,7 +66,7 @@ label { vertical-align: -1px; color: #9EA5B3; transition: all 0.3s; }
|
||||||
<input type="password" name="password" placeholder="Password" required/>
|
<input type="password" name="password" placeholder="Password" required/>
|
||||||
<input type="checkbox" name="keep" id="keep"><label for="keep">Keep me logged in</label>
|
<input type="checkbox" name="keep" id="keep"><label for="keep">Keep me logged in</label>
|
||||||
<div style="clear: both"></div>
|
<div style="clear: both"></div>
|
||||||
<a href="Login" class="button" onclick="return submit()" id="login_button"><span>Log In</span></a>
|
<a href="#" class="button" onclick="return submit()" id="login_button"><span>Log In</span></a>
|
||||||
<input type="submit" id="login_form_submit"/>
|
<input type="submit" id="login_form_submit"/>
|
||||||
</form>
|
</form>
|
||||||
</div>
|
</div>
|
||||||
|
@ -86,10 +86,10 @@ function submit() {
|
||||||
if (form.checkValidity()) {
|
if (form.checkValidity()) {
|
||||||
document.getElementById("login_button").className = "button login-anim"
|
document.getElementById("login_button").className = "button login-anim"
|
||||||
setTimeout(function () {
|
setTimeout(function () {
|
||||||
document.getElementById("login_form_submit").click()
|
form.submit()
|
||||||
}, 1000)
|
}, 1000)
|
||||||
} else {
|
} else {
|
||||||
document.getElementById("login_form_submit").click()
|
form.submit()
|
||||||
}
|
}
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
|
|
@ -8,7 +8,7 @@ class Config(object):
|
||||||
|
|
||||||
def __init__(self, argv):
|
def __init__(self, argv):
|
||||||
self.version = "0.3.1"
|
self.version = "0.3.1"
|
||||||
self.rev = 324
|
self.rev = 330
|
||||||
self.argv = argv
|
self.argv = argv
|
||||||
self.action = None
|
self.action = None
|
||||||
self.createParser()
|
self.createParser()
|
||||||
|
|
|
@ -37,7 +37,11 @@ class DebugReloader:
|
||||||
print "File system watcher failed: %s (on linux pyinotify not gevent compatible yet :( )" % err
|
print "File system watcher failed: %s (on linux pyinotify not gevent compatible yet :( )" % err
|
||||||
|
|
||||||
def changed(self, evt):
|
def changed(self, evt):
|
||||||
if not evt.path or "%s/" % config.data_dir in evt.path or evt.path.endswith("pyc") or time.time() - self.last_chaged < 1:
|
if (
|
||||||
|
not evt.path or "%s/" % config.data_dir in evt.path or
|
||||||
|
not evt.path.endswith("py") or
|
||||||
|
time.time() - self.last_chaged < 1
|
||||||
|
):
|
||||||
return False # Ignore *.pyc changes and no reload within 1 sec
|
return False # Ignore *.pyc changes and no reload within 1 sec
|
||||||
time.sleep(0.1) # Wait for lock release
|
time.sleep(0.1) # Wait for lock release
|
||||||
self.callback()
|
self.callback()
|
||||||
|
|
|
@ -189,15 +189,16 @@ class UiRequest(object):
|
||||||
|
|
||||||
if not site:
|
if not site:
|
||||||
return False
|
return False
|
||||||
return self.renderWrapper(site, path, inner_path, title, extra_headers)
|
|
||||||
|
self.sendHeader(extra_headers=extra_headers[:])
|
||||||
|
return iter([self.renderWrapper(site, path, inner_path, title, extra_headers)])
|
||||||
|
# Dont know why wrapping with iter necessary, but without it around 100x slower
|
||||||
|
|
||||||
else: # Bad url
|
else: # Bad url
|
||||||
return False
|
return False
|
||||||
|
|
||||||
|
|
||||||
def renderWrapper(self, site, path, inner_path, title, extra_headers):
|
def renderWrapper(self, site, path, inner_path, title, extra_headers):
|
||||||
self.sendHeader(extra_headers=extra_headers[:])
|
|
||||||
|
|
||||||
file_inner_path = inner_path
|
file_inner_path = inner_path
|
||||||
if not file_inner_path:
|
if not file_inner_path:
|
||||||
file_inner_path = "index.html" # If inner path defaults to index.html
|
file_inner_path = "index.html" # If inner path defaults to index.html
|
||||||
|
@ -236,7 +237,7 @@ class UiRequest(object):
|
||||||
if content.get("viewport"):
|
if content.get("viewport"):
|
||||||
meta_tags += '<meta name="viewport" id="viewport" content="%s">' % cgi.escape(content["viewport"], True)
|
meta_tags += '<meta name="viewport" id="viewport" content="%s">' % cgi.escape(content["viewport"], True)
|
||||||
|
|
||||||
yield self.render(
|
return self.render(
|
||||||
"src/Ui/template/wrapper.html",
|
"src/Ui/template/wrapper.html",
|
||||||
server_url=server_url,
|
server_url=server_url,
|
||||||
inner_path=inner_path,
|
inner_path=inner_path,
|
||||||
|
@ -326,14 +327,15 @@ class UiRequest(object):
|
||||||
return self.error400()
|
return self.error400()
|
||||||
|
|
||||||
# Stream a file to client
|
# Stream a file to client
|
||||||
def actionFile(self, file_path, block_size=64 * 1024):
|
def actionFile(self, file_path, block_size=64 * 1024, send_header=True):
|
||||||
if os.path.isfile(file_path):
|
if os.path.isfile(file_path):
|
||||||
# Try to figure out content type by extension
|
# Try to figure out content type by extension
|
||||||
content_type = self.getContentType(file_path)
|
content_type = self.getContentType(file_path)
|
||||||
|
|
||||||
# TODO: Dont allow external access: extra_headers=
|
# TODO: Dont allow external access: extra_headers=
|
||||||
# [("Content-Security-Policy", "default-src 'unsafe-inline' data: http://localhost:43110 ws://localhost:43110")]
|
# [("Content-Security-Policy", "default-src 'unsafe-inline' data: http://localhost:43110 ws://localhost:43110")]
|
||||||
self.sendHeader(content_type=content_type)
|
if send_header:
|
||||||
|
self.sendHeader(content_type=content_type)
|
||||||
if self.env["REQUEST_METHOD"] != "OPTIONS":
|
if self.env["REQUEST_METHOD"] != "OPTIONS":
|
||||||
file = open(file_path, "rb")
|
file = open(file_path, "rb")
|
||||||
while 1:
|
while 1:
|
||||||
|
|
|
@ -1,16 +1,15 @@
|
||||||
class Sidebar
|
class Fixbutton
|
||||||
constructor: ->
|
constructor: ->
|
||||||
@initFixbutton()
|
@dragging = false
|
||||||
|
$(".fixbutton-bg").on "mouseover", =>
|
||||||
|
$(".fixbutton-bg").stop().animate({"scale": 0.7}, 800, "easeOutElastic")
|
||||||
initFixbutton: ->
|
|
||||||
$(".fixbutton-bg").on "mouseover", ->
|
|
||||||
$(@).stop().animate({"scale": 0.7}, 800, "easeOutElastic")
|
|
||||||
$(".fixbutton-burger").stop().animate({"opacity": 1.5, "left": 0}, 800, "easeOutElastic")
|
$(".fixbutton-burger").stop().animate({"opacity": 1.5, "left": 0}, 800, "easeOutElastic")
|
||||||
$(".fixbutton-text").stop().animate({"opacity": 0, "left": 20}, 300, "easeOutCubic")
|
$(".fixbutton-text").stop().animate({"opacity": 0, "left": 20}, 300, "easeOutCubic")
|
||||||
|
|
||||||
$(".fixbutton-bg").on "mouseout", ->
|
$(".fixbutton-bg").on "mouseout", =>
|
||||||
$(@).stop().animate({"scale": 0.6}, 300, "easeOutCubic")
|
if $(".fixbutton").hasClass("dragging")
|
||||||
|
return true
|
||||||
|
$(".fixbutton-bg").stop().animate({"scale": 0.6}, 300, "easeOutCubic")
|
||||||
$(".fixbutton-burger").stop().animate({"opacity": 0, "left": -20}, 300, "easeOutCubic")
|
$(".fixbutton-burger").stop().animate({"opacity": 0, "left": -20}, 300, "easeOutCubic")
|
||||||
$(".fixbutton-text").stop().animate({"opacity": 1, "left": 0}, 300, "easeOutBack")
|
$(".fixbutton-text").stop().animate({"opacity": 1, "left": 0}, 300, "easeOutBack")
|
||||||
|
|
||||||
|
@ -19,15 +18,15 @@ class Sidebar
|
||||||
return false
|
return false
|
||||||
###
|
###
|
||||||
|
|
||||||
$(".fixbutton-bg").on "mousedown", ->
|
$(".fixbutton-bg").on "mousedown", =>
|
||||||
# $(".fixbutton-burger").stop().animate({"scale": 0.7, "left": 0}, 300, "easeOutCubic")
|
# $(".fixbutton-burger").stop().animate({"scale": 0.7, "left": 0}, 300, "easeOutCubic")
|
||||||
#$("#inner-iframe").toggleClass("back")
|
#$("#inner-iframe").toggleClass("back")
|
||||||
#$(".wrapper-iframe").stop().animate({"scale": 0.9}, 600, "easeOutCubic")
|
#$(".wrapper-iframe").stop().animate({"scale": 0.9}, 600, "easeOutCubic")
|
||||||
#$("body").addClass("back")
|
#$("body").addClass("back")
|
||||||
|
|
||||||
$(".fixbutton-bg").on "mouseup", ->
|
$(".fixbutton-bg").on "mouseup", =>
|
||||||
# $(".fixbutton-burger").stop().animate({"scale": 1, "left": 0}, 600, "easeOutElastic")
|
# $(".fixbutton-burger").stop().animate({"scale": 1, "left": 0}, 600, "easeOutElastic")
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
window.Sidebar = Sidebar
|
window.Fixbutton = Fixbutton
|
|
@ -4,7 +4,7 @@ class Wrapper
|
||||||
|
|
||||||
@loading = new Loading()
|
@loading = new Loading()
|
||||||
@notifications = new Notifications($(".notifications"))
|
@notifications = new Notifications($(".notifications"))
|
||||||
@sidebar = new Sidebar()
|
@fixbutton = new Fixbutton()
|
||||||
|
|
||||||
window.addEventListener("message", @onMessageInner, false)
|
window.addEventListener("message", @onMessageInner, false)
|
||||||
@inner = document.getElementById("inner-iframe").contentWindow
|
@inner = document.getElementById("inner-iframe").contentWindow
|
||||||
|
|
|
@ -4,7 +4,7 @@ a { color: black }
|
||||||
|
|
||||||
.template { display: none !important }
|
.template { display: none !important }
|
||||||
|
|
||||||
#inner-iframe { width: 100%; height: 100%; position: absolute; border: 0px; transition: all 0.8s cubic-bezier(0.68, -0.55, 0.265, 1.55), opacity 0.8s ease-in-out }
|
#inner-iframe { width: 100%; height: 100%; position: absolute; border: 0px } /*; transition: all 0.8s cubic-bezier(0.68, -0.55, 0.265, 1.55), opacity 0.8s ease-in-out*/
|
||||||
#inner-iframe.back { transform: scale(0.95) translate(-300px, 0px); opacity: 0.4 }
|
#inner-iframe.back { transform: scale(0.95) translate(-300px, 0px); opacity: 0.4 }
|
||||||
|
|
||||||
.button { padding: 5px 10px; margin-left: 10px; background-color: #FFF85F; border-bottom: 2px solid #CDBD1E; border-radius: 2px; text-decoration: none; transition: all 0.5s; }
|
.button { padding: 5px 10px; margin-left: 10px; background-color: #FFF85F; border-bottom: 2px solid #CDBD1E; border-radius: 2px; text-decoration: none; transition: all 0.5s; }
|
||||||
|
@ -19,14 +19,14 @@ a { color: black }
|
||||||
|
|
||||||
.fixbutton {
|
.fixbutton {
|
||||||
position: absolute; right: 35px; top: 15px; width: 40px; z-index: 999;
|
position: absolute; right: 35px; top: 15px; width: 40px; z-index: 999;
|
||||||
text-align: center; color: white; font-family: Consolas; font-size: 25px; line-height: 40px;
|
text-align: center; color: white; font-family: Consolas, Menlo, monospace; font-size: 25px;
|
||||||
}
|
}
|
||||||
.fixbutton-bg {
|
.fixbutton-bg {
|
||||||
border-radius: 80px; background-color: rgba(180, 180, 180, 0.5); cursor: pointer;
|
border-radius: 80px; background-color: rgba(180, 180, 180, 0.5); cursor: pointer;
|
||||||
display: block; width: 80px; height: 80px; transition: background-color 0.2s, box-shadow 0.5s; transform: scale(0.6); margin-left: -20px; margin-top: -20px; /* 2x size to prevent blur on anim */
|
display: block; width: 80px; height: 80px; transition: background-color 0.2s, box-shadow 0.5s; transform: scale(0.6); margin-left: -20px; margin-top: -20px; /* 2x size to prevent blur on anim */
|
||||||
/*box-shadow: inset 105px 260px 0px -200px rgba(0,0,0,0.1);*/ /* box-shadow: inset -75px 183px 0px -200px rgba(0,0,0,0.1); */
|
/*box-shadow: inset 105px 260px 0px -200px rgba(0,0,0,0.1);*/ /* box-shadow: inset -75px 183px 0px -200px rgba(0,0,0,0.1); */
|
||||||
}
|
}
|
||||||
.fixbutton-text { pointer-events: none; position: absolute; z-index: 999; width: 40px; backface-visibility: hidden; perspective: 1000px }
|
.fixbutton-text { pointer-events: none; position: absolute; z-index: 999; width: 40px; backface-visibility: hidden; perspective: 1000px; line-height: 0px; padding-top: 20px }
|
||||||
.fixbutton-burger { pointer-events: none; position: absolute; z-index: 999; width: 40px; opacity: 0; left: -20px; font-size: 48px; line-height: 32px }
|
.fixbutton-burger { pointer-events: none; position: absolute; z-index: 999; width: 40px; opacity: 0; left: -20px; font-size: 48px; line-height: 32px }
|
||||||
.fixbutton-bg:hover { background-color: #AF3BFF }
|
.fixbutton-bg:hover { background-color: #AF3BFF }
|
||||||
.fixbutton-bg:active { background-color: #9E2FEA; top: 1px; transition: none }
|
.fixbutton-bg:active { background-color: #9E2FEA; top: 1px; transition: none }
|
||||||
|
@ -37,14 +37,14 @@ a { color: black }
|
||||||
.notifications { position: absolute; top: 0px; right: 80px; display: inline-block; z-index: 999; white-space: nowrap }
|
.notifications { position: absolute; top: 0px; right: 80px; display: inline-block; z-index: 999; white-space: nowrap }
|
||||||
.notification {
|
.notification {
|
||||||
position: relative; float: right; clear: both; margin: 10px; box-sizing: border-box; overflow: hidden; backface-visibility: hidden; perspective: 1000px; padding-bottom: 5px;
|
position: relative; float: right; clear: both; margin: 10px; box-sizing: border-box; overflow: hidden; backface-visibility: hidden; perspective: 1000px; padding-bottom: 5px;
|
||||||
color: #4F4F4F; font-family: 'Helvetica Neue', 'Segoe UI', Helvetica, Arial, sans-serif; font-size: 14px; line-height: 20px; /*border: 1px solid rgba(210, 206, 205, 0.2)*/
|
color: #4F4F4F; font-family: 'Lucida Grande', 'Segoe UI', Helvetica, Arial, sans-serif; font-size: 14px; line-height: 20px; /*border: 1px solid rgba(210, 206, 205, 0.2)*/
|
||||||
}
|
}
|
||||||
.notification-icon {
|
.notification-icon {
|
||||||
display: block; width: 50px; height: 50px; position: absolute; float: left; z-index: 1;
|
display: block; width: 50px; height: 50px; position: absolute; float: left; z-index: 1;
|
||||||
text-align: center; background-color: #e74c3c; line-height: 45px; vertical-align: bottom; font-size: 40px; color: white;
|
text-align: center; background-color: #e74c3c; line-height: 45px; vertical-align: bottom; font-size: 40px; color: white;
|
||||||
}
|
}
|
||||||
.notification .body {
|
.notification .body {
|
||||||
max-width: 420px; padding-left: 14px; padding-right: 60px; height: 40px; vertical-align: middle; display: table;
|
max-width: 560px; padding-left: 14px; padding-right: 60px; height: 40px; vertical-align: middle; display: table;
|
||||||
background-color: white; left: 50px; top: 0px; position: relative; padding-top: 5px; padding-bottom: 5px;
|
background-color: white; left: 50px; top: 0px; position: relative; padding-top: 5px; padding-bottom: 5px;
|
||||||
}
|
}
|
||||||
.notification.long .body { padding-top: 10px; padding-bottom: 10px }
|
.notification.long .body { padding-top: 10px; padding-bottom: 10px }
|
||||||
|
|
|
@ -9,7 +9,7 @@ a { color: black }
|
||||||
|
|
||||||
.template { display: none !important }
|
.template { display: none !important }
|
||||||
|
|
||||||
#inner-iframe { width: 100%; height: 100%; position: absolute; border: 0px; -webkit-transition: all 0.8s cubic-bezier(0.68, -0.55, 0.265, 1.55), opacity 0.8s ease-in-out ; -moz-transition: all 0.8s cubic-bezier(0.68, -0.55, 0.265, 1.55), opacity 0.8s ease-in-out ; -o-transition: all 0.8s cubic-bezier(0.68, -0.55, 0.265, 1.55), opacity 0.8s ease-in-out ; -ms-transition: all 0.8s cubic-bezier(0.68, -0.55, 0.265, 1.55), opacity 0.8s ease-in-out ; transition: all 0.8s cubic-bezier(0.68, -0.55, 0.265, 1.55), opacity 0.8s ease-in-out }
|
#inner-iframe { width: 100%; height: 100%; position: absolute; border: 0px } /*; transition: all 0.8s cubic-bezier(0.68, -0.55, 0.265, 1.55), opacity 0.8s ease-in-out*/
|
||||||
#inner-iframe.back { -webkit-transform: scale(0.95) translate(-300px, 0px); -moz-transform: scale(0.95) translate(-300px, 0px); -o-transform: scale(0.95) translate(-300px, 0px); -ms-transform: scale(0.95) translate(-300px, 0px); transform: scale(0.95) translate(-300px, 0px) ; opacity: 0.4 }
|
#inner-iframe.back { -webkit-transform: scale(0.95) translate(-300px, 0px); -moz-transform: scale(0.95) translate(-300px, 0px); -o-transform: scale(0.95) translate(-300px, 0px); -ms-transform: scale(0.95) translate(-300px, 0px); transform: scale(0.95) translate(-300px, 0px) ; opacity: 0.4 }
|
||||||
|
|
||||||
.button { padding: 5px 10px; margin-left: 10px; background-color: #FFF85F; border-bottom: 2px solid #CDBD1E; -webkit-border-radius: 2px; -moz-border-radius: 2px; -o-border-radius: 2px; -ms-border-radius: 2px; border-radius: 2px ; text-decoration: none; -webkit-transition: all 0.5s; -moz-transition: all 0.5s; -o-transition: all 0.5s; -ms-transition: all 0.5s; transition: all 0.5s ; }
|
.button { padding: 5px 10px; margin-left: 10px; background-color: #FFF85F; border-bottom: 2px solid #CDBD1E; -webkit-border-radius: 2px; -moz-border-radius: 2px; -o-border-radius: 2px; -ms-border-radius: 2px; border-radius: 2px ; text-decoration: none; -webkit-transition: all 0.5s; -moz-transition: all 0.5s; -o-transition: all 0.5s; -ms-transition: all 0.5s; transition: all 0.5s ; }
|
||||||
|
@ -24,14 +24,14 @@ a { color: black }
|
||||||
|
|
||||||
.fixbutton {
|
.fixbutton {
|
||||||
position: absolute; right: 35px; top: 15px; width: 40px; z-index: 999;
|
position: absolute; right: 35px; top: 15px; width: 40px; z-index: 999;
|
||||||
text-align: center; color: white; font-family: Consolas; font-size: 25px; line-height: 40px;
|
text-align: center; color: white; font-family: Consolas, Menlo, monospace; font-size: 25px;
|
||||||
}
|
}
|
||||||
.fixbutton-bg {
|
.fixbutton-bg {
|
||||||
-webkit-border-radius: 80px; -moz-border-radius: 80px; -o-border-radius: 80px; -ms-border-radius: 80px; border-radius: 80px ; background-color: rgba(180, 180, 180, 0.5); cursor: pointer;
|
-webkit-border-radius: 80px; -moz-border-radius: 80px; -o-border-radius: 80px; -ms-border-radius: 80px; border-radius: 80px ; background-color: rgba(180, 180, 180, 0.5); cursor: pointer;
|
||||||
display: block; width: 80px; height: 80px; -webkit-transition: background-color 0.2s, box-shadow 0.5s; -moz-transition: background-color 0.2s, box-shadow 0.5s; -o-transition: background-color 0.2s, box-shadow 0.5s; -ms-transition: background-color 0.2s, box-shadow 0.5s; transition: background-color 0.2s, box-shadow 0.5s ; -webkit-transform: scale(0.6); -moz-transform: scale(0.6); -o-transform: scale(0.6); -ms-transform: scale(0.6); transform: scale(0.6) ; margin-left: -20px; margin-top: -20px; /* 2x size to prevent blur on anim */
|
display: block; width: 80px; height: 80px; -webkit-transition: background-color 0.2s, box-shadow 0.5s; -moz-transition: background-color 0.2s, box-shadow 0.5s; -o-transition: background-color 0.2s, box-shadow 0.5s; -ms-transition: background-color 0.2s, box-shadow 0.5s; transition: background-color 0.2s, box-shadow 0.5s ; -webkit-transform: scale(0.6); -moz-transform: scale(0.6); -o-transform: scale(0.6); -ms-transform: scale(0.6); transform: scale(0.6) ; margin-left: -20px; margin-top: -20px; /* 2x size to prevent blur on anim */
|
||||||
/*box-shadow: inset 105px 260px 0px -200px rgba(0,0,0,0.1);*/ /* -webkit-box-shadow: inset -75px 183px 0px -200px rgba(0,0,0,0.1); -moz-box-shadow: inset -75px 183px 0px -200px rgba(0,0,0,0.1); -o-box-shadow: inset -75px 183px 0px -200px rgba(0,0,0,0.1); -ms-box-shadow: inset -75px 183px 0px -200px rgba(0,0,0,0.1); box-shadow: inset -75px 183px 0px -200px rgba(0,0,0,0.1) ; */
|
/*box-shadow: inset 105px 260px 0px -200px rgba(0,0,0,0.1);*/ /* -webkit-box-shadow: inset -75px 183px 0px -200px rgba(0,0,0,0.1); -moz-box-shadow: inset -75px 183px 0px -200px rgba(0,0,0,0.1); -o-box-shadow: inset -75px 183px 0px -200px rgba(0,0,0,0.1); -ms-box-shadow: inset -75px 183px 0px -200px rgba(0,0,0,0.1); box-shadow: inset -75px 183px 0px -200px rgba(0,0,0,0.1) ; */
|
||||||
}
|
}
|
||||||
.fixbutton-text { pointer-events: none; position: absolute; z-index: 999; width: 40px; backface-visibility: hidden; -webkit-perspective: 1000px ; -moz-perspective: 1000px ; -o-perspective: 1000px ; -ms-perspective: 1000px ; perspective: 1000px }
|
.fixbutton-text { pointer-events: none; position: absolute; z-index: 999; width: 40px; backface-visibility: hidden; -webkit-perspective: 1000px; -moz-perspective: 1000px; -o-perspective: 1000px; -ms-perspective: 1000px; perspective: 1000px ; line-height: 0px; padding-top: 20px }
|
||||||
.fixbutton-burger { pointer-events: none; position: absolute; z-index: 999; width: 40px; opacity: 0; left: -20px; font-size: 48px; line-height: 32px }
|
.fixbutton-burger { pointer-events: none; position: absolute; z-index: 999; width: 40px; opacity: 0; left: -20px; font-size: 48px; line-height: 32px }
|
||||||
.fixbutton-bg:hover { background-color: #AF3BFF }
|
.fixbutton-bg:hover { background-color: #AF3BFF }
|
||||||
.fixbutton-bg:active { background-color: #9E2FEA; top: 1px; -webkit-transition: none ; -moz-transition: none ; -o-transition: none ; -ms-transition: none ; transition: none }
|
.fixbutton-bg:active { background-color: #9E2FEA; top: 1px; -webkit-transition: none ; -moz-transition: none ; -o-transition: none ; -ms-transition: none ; transition: none }
|
||||||
|
@ -42,14 +42,14 @@ a { color: black }
|
||||||
.notifications { position: absolute; top: 0px; right: 80px; display: inline-block; z-index: 999; white-space: nowrap }
|
.notifications { position: absolute; top: 0px; right: 80px; display: inline-block; z-index: 999; white-space: nowrap }
|
||||||
.notification {
|
.notification {
|
||||||
position: relative; float: right; clear: both; margin: 10px; -webkit-box-sizing: border-box; -moz-box-sizing: border-box; -o-box-sizing: border-box; -ms-box-sizing: border-box; box-sizing: border-box ; overflow: hidden; backface-visibility: hidden; -webkit-perspective: 1000px; -moz-perspective: 1000px; -o-perspective: 1000px; -ms-perspective: 1000px; perspective: 1000px ; padding-bottom: 5px;
|
position: relative; float: right; clear: both; margin: 10px; -webkit-box-sizing: border-box; -moz-box-sizing: border-box; -o-box-sizing: border-box; -ms-box-sizing: border-box; box-sizing: border-box ; overflow: hidden; backface-visibility: hidden; -webkit-perspective: 1000px; -moz-perspective: 1000px; -o-perspective: 1000px; -ms-perspective: 1000px; perspective: 1000px ; padding-bottom: 5px;
|
||||||
color: #4F4F4F; font-family: 'Helvetica Neue', 'Segoe UI', Helvetica, Arial, sans-serif; font-size: 14px; line-height: 20px; /*border: 1px solid rgba(210, 206, 205, 0.2)*/
|
color: #4F4F4F; font-family: 'Lucida Grande', 'Segoe UI', Helvetica, Arial, sans-serif; font-size: 14px; line-height: 20px; /*border: 1px solid rgba(210, 206, 205, 0.2)*/
|
||||||
}
|
}
|
||||||
.notification-icon {
|
.notification-icon {
|
||||||
display: block; width: 50px; height: 50px; position: absolute; float: left; z-index: 1;
|
display: block; width: 50px; height: 50px; position: absolute; float: left; z-index: 1;
|
||||||
text-align: center; background-color: #e74c3c; line-height: 45px; vertical-align: bottom; font-size: 40px; color: white;
|
text-align: center; background-color: #e74c3c; line-height: 45px; vertical-align: bottom; font-size: 40px; color: white;
|
||||||
}
|
}
|
||||||
.notification .body {
|
.notification .body {
|
||||||
max-width: 420px; padding-left: 14px; padding-right: 60px; height: 40px; vertical-align: middle; display: table;
|
max-width: 560px; padding-left: 14px; padding-right: 60px; height: 40px; vertical-align: middle; display: table;
|
||||||
background-color: white; left: 50px; top: 0px; position: relative; padding-top: 5px; padding-bottom: 5px;
|
background-color: white; left: 50px; top: 0px; position: relative; padding-top: 5px; padding-bottom: 5px;
|
||||||
}
|
}
|
||||||
.notification.long .body { padding-top: 10px; padding-bottom: 10px }
|
.notification.long .body { padding-top: 10px; padding-bottom: 10px }
|
||||||
|
|
|
@ -154,7 +154,7 @@
|
||||||
|
|
||||||
jQuery.cssHooks['scale'] = {
|
jQuery.cssHooks['scale'] = {
|
||||||
get: function(elem, computed, extra) {
|
get: function(elem, computed, extra) {
|
||||||
var match = window.getComputedStyle(elem).transform.match("[0-9\.]+")
|
var match = window.getComputedStyle(elem)[transform_property].match("[0-9\.]+")
|
||||||
if (match) {
|
if (match) {
|
||||||
var scale = parseFloat(match[0])
|
var scale = parseFloat(match[0])
|
||||||
return scale
|
return scale
|
||||||
|
@ -164,14 +164,14 @@ jQuery.cssHooks['scale'] = {
|
||||||
},
|
},
|
||||||
set: function(elem, val) {
|
set: function(elem, val) {
|
||||||
//var transforms = $(elem).css("transform").match(/[0-9\.]+/g)
|
//var transforms = $(elem).css("transform").match(/[0-9\.]+/g)
|
||||||
var transforms = window.getComputedStyle(elem).transform.match(/[0-9\.]+/g)
|
var transforms = window.getComputedStyle(elem)[transform_property].match(/[0-9\.]+/g)
|
||||||
if (transforms) {
|
if (transforms) {
|
||||||
transforms[0] = val
|
transforms[0] = val
|
||||||
transforms[3] = val
|
transforms[3] = val
|
||||||
//$(elem).css("transform", 'matrix('+transforms.join(", ")+")")
|
//$(elem).css("transform", 'matrix('+transforms.join(", ")+")")
|
||||||
elem.style.transform = 'matrix('+transforms.join(", ")+')'
|
elem.style[transform_property] = 'matrix('+transforms.join(", ")+')'
|
||||||
} else {
|
} else {
|
||||||
elem.style.transform = "scale("+val+")"
|
elem.style[transform_property] = "scale("+val+")"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -181,6 +181,14 @@ jQuery.fx.step.scale = function(fx) {
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
if (window.getComputedStyle(document.body).transform) {
|
||||||
|
transform_property = "transform"
|
||||||
|
} else {
|
||||||
|
transform_property = "webkitTransform"
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/* ---- src/Ui/media/lib/jquery.csslater.coffee ---- */
|
/* ---- src/Ui/media/lib/jquery.csslater.coffee ---- */
|
||||||
|
|
||||||
|
|
||||||
|
@ -458,6 +466,69 @@ jQuery.extend( jQuery.easing,
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
|
/* ---- src/Ui/media/Fixbutton.coffee ---- */
|
||||||
|
|
||||||
|
|
||||||
|
(function() {
|
||||||
|
var Fixbutton;
|
||||||
|
|
||||||
|
Fixbutton = (function() {
|
||||||
|
function Fixbutton() {
|
||||||
|
this.dragging = false;
|
||||||
|
$(".fixbutton-bg").on("mouseover", (function(_this) {
|
||||||
|
return function() {
|
||||||
|
$(".fixbutton-bg").stop().animate({
|
||||||
|
"scale": 0.7
|
||||||
|
}, 800, "easeOutElastic");
|
||||||
|
$(".fixbutton-burger").stop().animate({
|
||||||
|
"opacity": 1.5,
|
||||||
|
"left": 0
|
||||||
|
}, 800, "easeOutElastic");
|
||||||
|
return $(".fixbutton-text").stop().animate({
|
||||||
|
"opacity": 0,
|
||||||
|
"left": 20
|
||||||
|
}, 300, "easeOutCubic");
|
||||||
|
};
|
||||||
|
})(this));
|
||||||
|
$(".fixbutton-bg").on("mouseout", (function(_this) {
|
||||||
|
return function() {
|
||||||
|
if ($(".fixbutton").hasClass("dragging")) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
$(".fixbutton-bg").stop().animate({
|
||||||
|
"scale": 0.6
|
||||||
|
}, 300, "easeOutCubic");
|
||||||
|
$(".fixbutton-burger").stop().animate({
|
||||||
|
"opacity": 0,
|
||||||
|
"left": -20
|
||||||
|
}, 300, "easeOutCubic");
|
||||||
|
return $(".fixbutton-text").stop().animate({
|
||||||
|
"opacity": 1,
|
||||||
|
"left": 0
|
||||||
|
}, 300, "easeOutBack");
|
||||||
|
};
|
||||||
|
})(this));
|
||||||
|
|
||||||
|
/*$(".fixbutton-bg").on "click", ->
|
||||||
|
return false
|
||||||
|
*/
|
||||||
|
$(".fixbutton-bg").on("mousedown", (function(_this) {
|
||||||
|
return function() {};
|
||||||
|
})(this));
|
||||||
|
$(".fixbutton-bg").on("mouseup", (function(_this) {
|
||||||
|
return function() {};
|
||||||
|
})(this));
|
||||||
|
}
|
||||||
|
|
||||||
|
return Fixbutton;
|
||||||
|
|
||||||
|
})();
|
||||||
|
|
||||||
|
window.Fixbutton = Fixbutton;
|
||||||
|
|
||||||
|
}).call(this);
|
||||||
|
|
||||||
|
|
||||||
/* ---- src/Ui/media/Loading.coffee ---- */
|
/* ---- src/Ui/media/Loading.coffee ---- */
|
||||||
|
|
||||||
|
|
||||||
|
@ -681,61 +752,6 @@ jQuery.extend( jQuery.easing,
|
||||||
}).call(this);
|
}).call(this);
|
||||||
|
|
||||||
|
|
||||||
/* ---- src/Ui/media/Sidebar.coffee ---- */
|
|
||||||
|
|
||||||
|
|
||||||
(function() {
|
|
||||||
var Sidebar;
|
|
||||||
|
|
||||||
Sidebar = (function() {
|
|
||||||
function Sidebar() {
|
|
||||||
this.initFixbutton();
|
|
||||||
}
|
|
||||||
|
|
||||||
Sidebar.prototype.initFixbutton = function() {
|
|
||||||
$(".fixbutton-bg").on("mouseover", function() {
|
|
||||||
$(this).stop().animate({
|
|
||||||
"scale": 0.7
|
|
||||||
}, 800, "easeOutElastic");
|
|
||||||
$(".fixbutton-burger").stop().animate({
|
|
||||||
"opacity": 1.5,
|
|
||||||
"left": 0
|
|
||||||
}, 800, "easeOutElastic");
|
|
||||||
return $(".fixbutton-text").stop().animate({
|
|
||||||
"opacity": 0,
|
|
||||||
"left": 20
|
|
||||||
}, 300, "easeOutCubic");
|
|
||||||
});
|
|
||||||
$(".fixbutton-bg").on("mouseout", function() {
|
|
||||||
$(this).stop().animate({
|
|
||||||
"scale": 0.6
|
|
||||||
}, 300, "easeOutCubic");
|
|
||||||
$(".fixbutton-burger").stop().animate({
|
|
||||||
"opacity": 0,
|
|
||||||
"left": -20
|
|
||||||
}, 300, "easeOutCubic");
|
|
||||||
return $(".fixbutton-text").stop().animate({
|
|
||||||
"opacity": 1,
|
|
||||||
"left": 0
|
|
||||||
}, 300, "easeOutBack");
|
|
||||||
});
|
|
||||||
|
|
||||||
/*$(".fixbutton-bg").on "click", ->
|
|
||||||
return false
|
|
||||||
*/
|
|
||||||
$(".fixbutton-bg").on("mousedown", function() {});
|
|
||||||
return $(".fixbutton-bg").on("mouseup", function() {});
|
|
||||||
};
|
|
||||||
|
|
||||||
return Sidebar;
|
|
||||||
|
|
||||||
})();
|
|
||||||
|
|
||||||
window.Sidebar = Sidebar;
|
|
||||||
|
|
||||||
}).call(this);
|
|
||||||
|
|
||||||
|
|
||||||
/* ---- src/Ui/media/Wrapper.coffee ---- */
|
/* ---- src/Ui/media/Wrapper.coffee ---- */
|
||||||
|
|
||||||
|
|
||||||
|
@ -756,7 +772,7 @@ jQuery.extend( jQuery.easing,
|
||||||
this.log("Created!");
|
this.log("Created!");
|
||||||
this.loading = new Loading();
|
this.loading = new Loading();
|
||||||
this.notifications = new Notifications($(".notifications"));
|
this.notifications = new Notifications($(".notifications"));
|
||||||
this.sidebar = new Sidebar();
|
this.fixbutton = new Fixbutton();
|
||||||
window.addEventListener("message", this.onMessageInner, false);
|
window.addEventListener("message", this.onMessageInner, false);
|
||||||
this.inner = document.getElementById("inner-iframe").contentWindow;
|
this.inner = document.getElementById("inner-iframe").contentWindow;
|
||||||
this.ws = new ZeroWebsocket(ws_url);
|
this.ws = new ZeroWebsocket(ws_url);
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
jQuery.cssHooks['scale'] = {
|
jQuery.cssHooks['scale'] = {
|
||||||
get: function(elem, computed, extra) {
|
get: function(elem, computed, extra) {
|
||||||
var match = window.getComputedStyle(elem).transform.match("[0-9\.]+")
|
var match = window.getComputedStyle(elem)[transform_property].match("[0-9\.]+")
|
||||||
if (match) {
|
if (match) {
|
||||||
var scale = parseFloat(match[0])
|
var scale = parseFloat(match[0])
|
||||||
return scale
|
return scale
|
||||||
|
@ -10,14 +10,14 @@ jQuery.cssHooks['scale'] = {
|
||||||
},
|
},
|
||||||
set: function(elem, val) {
|
set: function(elem, val) {
|
||||||
//var transforms = $(elem).css("transform").match(/[0-9\.]+/g)
|
//var transforms = $(elem).css("transform").match(/[0-9\.]+/g)
|
||||||
var transforms = window.getComputedStyle(elem).transform.match(/[0-9\.]+/g)
|
var transforms = window.getComputedStyle(elem)[transform_property].match(/[0-9\.]+/g)
|
||||||
if (transforms) {
|
if (transforms) {
|
||||||
transforms[0] = val
|
transforms[0] = val
|
||||||
transforms[3] = val
|
transforms[3] = val
|
||||||
//$(elem).css("transform", 'matrix('+transforms.join(", ")+")")
|
//$(elem).css("transform", 'matrix('+transforms.join(", ")+")")
|
||||||
elem.style.transform = 'matrix('+transforms.join(", ")+')'
|
elem.style[transform_property] = 'matrix('+transforms.join(", ")+')'
|
||||||
} else {
|
} else {
|
||||||
elem.style.transform = "scale("+val+")"
|
elem.style[transform_property] = "scale("+val+")"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -25,3 +25,10 @@ jQuery.cssHooks['scale'] = {
|
||||||
jQuery.fx.step.scale = function(fx) {
|
jQuery.fx.step.scale = function(fx) {
|
||||||
jQuery.cssHooks['scale'].set(fx.elem, fx.now)
|
jQuery.cssHooks['scale'].set(fx.elem, fx.now)
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
if (window.getComputedStyle(document.body).transform) {
|
||||||
|
transform_property = "transform"
|
||||||
|
} else {
|
||||||
|
transform_property = "webkitTransform"
|
||||||
|
}
|
||||||
|
|
|
@ -47,9 +47,11 @@ class Worker(object):
|
||||||
except Exception, err:
|
except Exception, err:
|
||||||
self.manager.log.debug("%s: getFile error: %s" % (self.key, err))
|
self.manager.log.debug("%s: getFile error: %s" % (self.key, err))
|
||||||
buff = None
|
buff = None
|
||||||
if self.running is False or task["done"] is True: # Worker no longer needed or got killed
|
if self.running is False: # Worker no longer needed or got killed
|
||||||
self.manager.log.debug("%s: No longer needed, returning: %s" % (self.key, task["inner_path"]))
|
self.manager.log.debug("%s: No longer needed, returning: %s" % (self.key, task["inner_path"]))
|
||||||
break
|
break
|
||||||
|
if task["done"] is True: # Task done, try to find new one
|
||||||
|
continue
|
||||||
if buff: # Download ok
|
if buff: # Download ok
|
||||||
correct = site.content_manager.verifyFile(task["inner_path"], buff)
|
correct = site.content_manager.verifyFile(task["inner_path"], buff)
|
||||||
else: # Download error
|
else: # Download error
|
||||||
|
|
|
@ -7,7 +7,7 @@ def prefix(content):
|
||||||
content, flags=re.DOTALL
|
content, flags=re.DOTALL
|
||||||
)
|
)
|
||||||
content = re.sub(
|
content = re.sub(
|
||||||
'([^-\*])(border-radius|box-shadow|transition|animation|box-sizing|' +
|
'([^-\*])(border-radius|box-shadow|appearance|transition|animation|box-sizing|' +
|
||||||
'transform|filter|perspective|animation-[a-z-]+): (.*?)([;}])',
|
'transform|filter|perspective|animation-[a-z-]+): (.*?)([;}])',
|
||||||
'\\1-webkit-\\2: \\3; -moz-\\2: \\3; -o-\\2: \\3; -ms-\\2: \\3; \\2: \\3 \\4', content
|
'\\1-webkit-\\2: \\3; -moz-\\2: \\3; -o-\\2: \\3; -ms-\\2: \\3; \\2: \\3 \\4', content
|
||||||
)
|
)
|
||||||
|
|
Loading…
Reference in a new issue