Skip to content

Commit

Permalink
❄️v2.7.4
Browse files Browse the repository at this point in the history
  • Loading branch information
@Trevelopment
Trevelopment committed Dec 26, 2017
1 parent 4b45727 commit d2cb740
Show file tree
Hide file tree
Showing 93 changed files with 3,209 additions and 1,515 deletions.
16 changes: 16 additions & 0 deletions app/assets/css/checkboxStyles.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -718,3 +718,19 @@ input[type=color]::-webkit-color-swatch {
height: 33px;
padding: 5px;
}
.w3-col .speedo-check.extrCheck {
padding: 2px 2px 0px 4px;
}
#aaBetaVer {
top: 9px;
}
#custOptions19 tr.w3-col.w3-row td {
padding: 2px 2px 0px 0px;
}
tr.w3-row.w3-col td strong {
margin: 15px;
line-height: 2;
}
.w3-sidenav tr.w3-row.w3-col td strong {
margin: 8px;
}
56 changes: 49 additions & 7 deletions app/assets/css/index.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -355,6 +355,7 @@ footer [class*="icon-"] {
}
span.test-panel-toggle,
.footer-donate {
margin-top: 5px;
position: fixed;
left: 10px;
z-index: 99999;
Expand All @@ -374,6 +375,7 @@ span.test-panel-toggle,
font-size: 21px;
}
footer .contact-form {
margin-top: 3px;
right: 10px;
position: fixed;
}
Expand Down Expand Up @@ -463,6 +465,7 @@ section.options {
font-size: 14px;
letter-spacing: normal;
font-weight: normal;
line-height: normal;
}
.form-group, .form-actions {
margin: 10px;
Expand Down Expand Up @@ -988,6 +991,9 @@ body.w3-black {
.modal-footer button {
font-size: 18px;
}
.bootbox.copytoUSB1 .bootbox-body {
width: 360px;
}
.copytoUSB1 .modal-footer button,
.bootbox-confirm .modal-footer button {
min-width: 35%;
Expand Down Expand Up @@ -1294,6 +1300,7 @@ span.icon-question {
}
#sidePanel td {
padding: 3px 5px;
vertical-align: -webkit-baseline-middle;
}
div#fullSystemRestore {
top: 30%;
Expand Down Expand Up @@ -1715,10 +1722,12 @@ tr#uistyle-mainlabel.color td input[type="color"] {
.update-info h5 {
font-weight: 600;
}
.unwifiap,
.update-info a,
.help-messages a,
#sidePanel a:not(.w3-closenav) {
border-bottom: 1px dashed #499aff;
cursor: pointer;
}
a#update-available {
white-space: nowrap;
Expand Down Expand Up @@ -1794,23 +1803,24 @@ a.handle:active {
.featherlight.myStance .featherlight-content {
max-width: 90%;
}
.featherlight.myStance h1.featherlight-inner {
.featherlight.myStance .featherlight-inner h1 {
white-space:normal;
font-size: 1.6rem;
}
.featherlight.myStance h2.featherlight-inner {
.featherlight.myStance .featherlight-inner h2 {
text-align: center;
font-size: 1.2rem;
}
.featherlight.myStance h3.featherlight-inner {
.featherlight.myStance .featherlight-inner h3 {
text-align: center;
font-size: 1.1rem;
}
.featherlight.myStance h4.featherlight-inner {
.featherlight.myStance .featherlight-inner h4 {
text-align: justify;
font-size: 1rem;
}
.featherlight.myStance p.featherlight-inner {
font-size: 20px;
text-align: justify;
}
.featherlight.myStance a {
Expand All @@ -1823,6 +1833,12 @@ a.handle:active {
.featherlight.myStance {
user-select:none;
}
.featherlight.myStance #firstTimer {
text-align: center;
}
script.featherlight-inner {
display: none!important;
}
.featherlight.autoHelpBox .featherlight-content {
width: 80%;
max-width: 800px;
Expand Down Expand Up @@ -1897,6 +1913,23 @@ input#id7Recovery {
line-height: 40px;
border: none;
}
style.featherlight-inner{
display:none!important;
}
.speedoRef{
text-align:right;
margin-top:-500px;
width:40%;
max-width:500px;
}
pre.featherlight-inner code {
white-space: pre;
width: 60%;
display: inline-block;
}
.featherlight .featherlight-content{
max-height:100%
}
#sidePanel div#anonce {
border: 2px dashed;
padding: 20px;
Expand All @@ -1905,8 +1938,8 @@ input#id7Recovery {
}
#sidePanel td.aa-side.w3-col label,
#sidePanel td.aa-side.w3-col input {
margin-top: 0;
padding-bottom: 10px;
margin-top: 0;
padding-bottom: 10px;
}
.featherlight-content .anonCloseBtn {
display: none;
Expand Down Expand Up @@ -1943,5 +1976,14 @@ label.w3-label.checkAutorun {
}
.w3-navbar *,
.w3-sidenav * {
cursor: pointer;
cursor: pointer;
}
.w3-sidenav .AAmsg div {
padding: 10px;
font-weight: 500;
font-size: 14px;
}
.w3-sidenav .AAmsg div a {
display: inline;
padding: 0px 2px;
}
61 changes: 46 additions & 15 deletions app/assets/js/build-tweaks.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,7 @@ function buildTweakFile (user) {
message: `<div style='text-align:center;'>${langObj.popupMsgs[0].msg}<br><div id='userLogView' style='text-align:center;' ></div><br><img class='loader' src='./files/img/load-1.gif' alt='...' /></div><div id='copy-loc'>${langObj.popupMsgs[1].msg}: ${tmpdir}<span class="w3-close icon-x w3-right" onclick="$(this).parent().hide()"></span></div>`,
closeButton: false
})
persistantData.set('keepBackups', user.backups.org)
persistantData.set('testBackups', user.backups.test)
persistantData.set('skipConfirm', user.backups.skipconfirm)
saveInstallerOps(user)
if (fs.existsSync(`${tmpdir}`)) {
aioLog('Delete old _copy_to_usb folder...')
try {
Expand Down Expand Up @@ -405,12 +403,28 @@ function buildTweak (user) {
} else if (user.speedoOps.bg.id === 31) {
addTweak('19_speedo-old_background.txt', true)
}
if (user.speedoOps.sbtemp) {
addTweak('19_speedo-sbtemp.txt', true)
}
if (user.speedoOps.temperature.id === 43) {
addTweak('19_speedo-temp.txt', true)
}
if (user.speedoOps.effic.id === 41) {
addTweak('19_speedo-sbtemp.txt', true)
}
if (user.speedoOps.digiclock) {
addTweak('19_speedo-digiclock.txt', true)
}
addTweak('19_speedo-i2.txt', true)
addTweakDir('speedometer', true)
if (user.speedoOps.mod) {
if (user.speedoOps.mod || user.speedoOps.simpmod) {
addTweak('19_speedo_variant-i.txt', true)
addTweakDir('speedometer_mod', true)
}
if (user.speedoOps.simpmod) {
addTweak('19_speedo_bar.txt', true)
addTweakDir('speedometer_bar', true)
}
}
if (user.options.indexOf(21) !== -1) {
addTweak('08_orderflac-i.txt')
Expand All @@ -423,7 +437,8 @@ function buildTweak (user) {
if (user.options.indexOf(25) !== -1) {
addTweak('25_androidauto-i.txt')
addTweakDir('androidauto', true)
if(user.aaBetaVer){
if(user.aaBetaVer) {
addTweak('25_androidautob-i.txt')
addTweakDir('androidautob', true)
}
}
Expand Down Expand Up @@ -453,6 +468,9 @@ function buildTweak (user) {
if (user.options.indexOf(17) !== -1) {
addTweak('17_videoplayer-i.txt')
addTweakDir('videoplayer', true)
if(user.vpUnicode) {
addTweak('17_videoplayer-unicode.txt')
}
}
if (user.options.indexOf(27) !== -1) {
addTweak('27_aioapp-i.txt')
Expand Down Expand Up @@ -559,6 +577,8 @@ function buildTweak (user) {
if (user.swapOps.mount) {
swapdest = '/config/swapfile/'
addTweak('18_swapfile-i.txt')
} else {
swapdest = '/'
}
}
// Finish with the end script
Expand Down Expand Up @@ -893,12 +913,18 @@ function usbDrives () {
})
appendAIOlog(`Error finding USB drives: ${error}`)
}
try {
dsklst.forEach((drive) => {
if (!drive.system) {
disks.push({'desc': drive.description, 'mp': `${drive.mountpoints[0].path}`})
usbDriveLst.push({'text': `<span class='icon-usb'></span> ${drive.mountpoints[0].path} ${drive.description.replace(' USB Device', '')}`, 'value': drive.mountpoints[0].path})
}
})
} catch(e) {
appendAIOlog("Error: " + e)
disks = null
}

introJs().hideHints()
var usb = disks
var lst = ''
Expand Down Expand Up @@ -933,12 +959,12 @@ function usbDrives () {
if (!result) {
unzipSwapfile(null)
} else {
persistantData.set('delCopyFolder', $('#rmCpDirCheck').prop('checked'))
settings.set('delCopyFolder', $('#rmCpDirCheck').prop('checked'))
copyToUSB(result)
}
}
})
$('#rmCpDirCheck').prop('checked', persistantData.get('delCopyFolder'))
$('#rmCpDirCheck').prop('checked', settings.get('delCopyFolder'))
} else if (usb.length === 1) {
lst = `<h2><b>${langObj.popupMsgs[6].msg}: </b></h2>`
for (var k = 0; k < usb.length; k++) {
Expand All @@ -964,12 +990,12 @@ function usbDrives () {
if (!result) {
unzipSwapfile(null)
} else {
persistantData.set('delCopyFolder', $('#rmCpDirCheck').prop('checked'))
settings.set('delCopyFolder', $('#rmCpDirCheck').prop('checked'))
copyToUSB(usb[0].mp)
}
}
})
$('#rmCpDirCheck').prop('checked', persistantData.get('delCopyFolder'))
$('#rmCpDirCheck').prop('checked', settings.get('delCopyFolder'))
return usb
}
})
Expand Down Expand Up @@ -1036,7 +1062,7 @@ function unzipSwapfile (dest) {
}, 35000)
setTimeout(function () {
if (document.getElementById('swapLogView')) {
document.getElementById('swapLogView').innerHTML = `${langObj.popupMsgs[16].msg}:<br>${langObj.tweakOps[17].toolTip}`
document.getElementById('swapLogView').innerHTML = `${langObj.popupMsgs[16].msg}:<br>${langObj.tweakOps[19].toolTip}`
}
}, 40000)
try {
Expand Down Expand Up @@ -1074,7 +1100,7 @@ var openUSB = ''
function finishedMessage (mp) {
// Finished message
if (mp) {
if (persistantData.get('delCopyFolder')) {
if (settings.get('delCopyFolder')) {
cleanCopyDir()
cp2usb = ''
}
Expand All @@ -1094,7 +1120,7 @@ function finishedMessage (mp) {
className: 'finishedMessage',
closeButton: false
})
finalbox.on('shown.bs.modal',function(){
finalbox.on('shown.bs.modal',function() {
$("#startOver").focus();
})
}, 100)
Expand All @@ -1108,6 +1134,11 @@ function postInstallTitle () {
$('.twkfltr').hide()
document.getElementById(`mzd-title`).innerHTML = `${viewLog}${document.getElementById('mzd-title').innerHTML}${strtOver}`
}
function saveInstallerOps (user) {
settings.set('keepBackups', user.backups.org)
settings.set('testBackups', user.backups.test)
settings.set('skipConfirm', user.backups.skipconfirm)
}
function cleanCopyDir () {
rimraf(`${tmpdir}`, function () { appendAIOlog(`<li style='color:#ff3366'>Deleted '_copy_to_usb' Folder</li>`) })
}
Expand Down Expand Up @@ -1136,10 +1167,10 @@ function fullSystemRestore (user) {
addRootFiles()
tweaks2write.push(`${builddir}00___fullRestore.sh`)
if(fs.existsSync(`${extradir}/color-schemes/Red/jci.zip`)) {
mkdirp.sync(`${tmpdir}/config/color-schemes`)
mkdirp.sync(`${tmpdir}/config/color-schemes/Red`)
aioLog(`Unzipping Red color theme folder`)
extract(`${extradir}/color-schemes/Red/jci.zip`, {dir: `${tmpdir}/config/color-schemes/Red`}, function (err) {
if (err) { aioLog(err, err) }
if (err) { aioLog(err) }
aioLog(`Red Color Scheme Added Successfully`)
})
}
Expand Down Expand Up @@ -1216,7 +1247,7 @@ function addWifiApp (user) {
size: "small",
title: "Values Were Not Changed",
message: "WiFi App Will not be installed",
callback: function(){
callback: function() {
rimraf.sync(`${tmpdir}/00-start-wifiAP/`)
printAIOlog()
}
Expand Down
2 changes: 1 addition & 1 deletion app/assets/vendor/w3.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ ul.w3-ul li:last-child{border-bottom:none}
.w3-accordion-content a{padding:6px 16px;display:block}.w3-accordion-content a:hover{background-color:#ccc}
.w3-progress-container{width:100%;height:1.5em;position:relative;background-color:#f1f1f1}
.w3-progressbar{background-color:#757575;height:100%;position:absolute;line-height:inherit}
.bootbox-form .checkbox input[type=checkbox],input[type=checkbox].w3-check,input[type=radio].w3-radio{width:24px;height:24px;position:relative;top:6px;visibility:visible;}
.bootbox-form .checkbox input[type=checkbox],input[type=checkbox].w3-check,input[type=radio].w3-radio{width:24px;height:24px;position:relative;/*top:6px;*/visibility:visible;}
input[type=checkbox].w3-check:checked+.w3-validate,input[type=radio].w3-radio:checked+.w3-validate{color:#009688}
input[type=checkbox].w3-check:disabled+.w3-validate,input[type=radio].w3-radio:disabled+.w3-validate{color:#aaa}
.w3-responsive{overflow-x:auto}
Expand Down

0 comments on commit d2cb740

Please sign in to comment.