Skip to content
This repository has been archived by the owner on Nov 25, 2020. It is now read-only.

Commit

Permalink
Fix FormManager password-create field for IE8
Browse files Browse the repository at this point in the history
Switch spinner to spinKit double-bounce
  • Loading branch information
cdujeu committed Feb 19, 2014
1 parent b549285 commit 068f8eb
Show file tree
Hide file tree
Showing 7 changed files with 110 additions and 6 deletions.
2 changes: 1 addition & 1 deletion core/src/plugins/gui.ajax/res/js/ajaxplorer.js

Large diffs are not rendered by default.

Expand Up @@ -257,7 +257,15 @@ Class.create("AjxpBootstrap", {
}else{
html+= '';
}
html += '<div style="height: 85px;position: relative;" id="loader_round_progress"><div class="rotating" style="width: 0;height: 0;border: 24px solid rgb(0, 123, 219);border-radius: 50px;position: absolute;clip: rect(0px, 50px, 100px, 0px);left: 131px;top: 11px;color: white;font-size: 20px;">.</div></div>';
var spinnerType = "double-bounce";
if(this.parameters.get("spinner-type")) spinnerType = this.parameters.get("spinner-type");
if(spinnerType == "planet-rotating"){
html += '<div style="height: 85px;position: relative;" id="loader_round_progress"><div class="rotating" style="width: 0;height: 0;border: 24px solid rgb(0, 123, 219);border-radius: 50px;position: absolute;clip: rect(0px, 50px, 100px, 0px);left: 131px;top: 11px;color: white;font-size: 20px;">.</div></div>';
}else if(spinnerType == "stretch-rectangles"){
html += '<div style="position: relative;" id="loader_round_progress" class="rect_spinners"><div class="rect1"></div><div class="rect2"></div><div class="rect3"></div><div class="rect4"></div><div class="rect5"></div></div>';
}else if(spinnerType == "double-bounce"){
html += '<div style="position: relative;" id="loader_round_progress" class="bounce-spinner"><div class="double-bounce1"></div><div class="double-bounce2"></div></div>';
}
html += '<div style="padding:5px;font-size: 11px;line-height: 1.5em;" class="dialogFooter" id="loader_dialog_footer">';
if(customWording.title.toLowerCase() != "ajaxplorer"){
html+=' <div style="padding:4px 7px;position: relative;"><div>Pydio Community Edition<span id="version_span"></span></div>';
Expand Down
Expand Up @@ -381,7 +381,7 @@ Class.create("FormManager", {
}else if(type=='password-create'){
var button = new Element('span', {className:'icon-refresh ajxpPasswordGenerate'});
element.insert({after:button});
element.up('.SF_element').setStyle({position:'relative'});
div.setStyle({position:'relative'});
button.observe('click', function(){
element.setValue(Math.random().toString(36).slice(-10));
});
Expand Down
2 changes: 1 addition & 1 deletion core/src/plugins/gui.ajax/res/js/ajaxplorer_boot.js

Large diffs are not rendered by default.

Large diffs are not rendered by default.

96 changes: 96 additions & 0 deletions core/src/plugins/gui.ajax/res/themes/vision/css/ajaxplorer.css
Expand Up @@ -4873,4 +4873,100 @@ div.horizontal_tabulator > div:not(.tabulatorContainer){
width: 14px !important;
height: 16px !important;
float: left;
}


.rect_spinners {
margin: 30px auto;
width: 50px;
height: 35px;
text-align: center;
font-size: 10px;
}

.rect_spinners > div {
background-color: #00A790;
height: 100%;
width: 6px;
display: inline-block;
margin-right: 2px;
-webkit-animation: stretchdelay 1.2s infinite ease-in-out;
animation: stretchdelay 1.2s infinite ease-in-out;
}

.rect_spinners div.rect2 {
-webkit-animation-delay: -1.1s;
animation-delay: -1.1s;
}

.rect_spinners div.rect3 {
-webkit-animation-delay: -1.0s;
animation-delay: -1.0s;
}

.rect_spinners div.rect4 {
-webkit-animation-delay: -0.9s;
animation-delay: -0.9s;
}

.rect_spinners div.rect5 {
-webkit-animation-delay: -0.8s;
animation-delay: -0.8s;
}

@-webkit-keyframes stretchdelay {
0%, 40%, 100% { -webkit-transform: scaleY(0.4) }
20% { -webkit-transform: scaleY(1.0) }
}

@keyframes stretchdelay {
0%, 40%, 100% {
transform: scaleY(0.4);
-webkit-transform: scaleY(0.4);
} 20% {
transform: scaleY(1.0);
-webkit-transform: scaleY(1.0);
}
}

.bounce-spinner {
width: 50px;
height: 50px;

position: relative;
margin: 30px auto;
}

.double-bounce1, .double-bounce2 {
width: 100%;
height: 100%;
border-radius: 50%;
background-color: #00A790;
opacity: 0.6;
position: absolute;
top: 0;
left: 0;

-webkit-animation: bounce 2.0s infinite ease-in-out;
animation: bounce 2.0s infinite ease-in-out;
}

.double-bounce2 {
-webkit-animation-delay: -1.0s;
animation-delay: -1.0s;
}

@-webkit-keyframes bounce {
0%, 100% { -webkit-transform: scale(0.0) }
50% { -webkit-transform: scale(1.0) }
}

@keyframes bounce {
0%, 100% {
transform: scale(0.0);
-webkit-transform: scale(0.0);
} 50% {
transform: scale(1.0);
-webkit-transform: scale(1.0);
}
}
2 changes: 1 addition & 1 deletion core/src/plugins/gui.ajax/res/themes/vision/css/allz.css

Large diffs are not rendered by default.

0 comments on commit 068f8eb

Please sign in to comment.