diff options
| author | Jay Freeman (saurik) <saurik@saurik.com> | 2008-12-09 03:14:28 +0000 |
|---|---|---|
| committer | Jay Freeman (saurik) <saurik@saurik.com> | 2010-09-30 07:09:04 +0000 |
| commit | fefdda6bcfde597dac30b4f18341a0598cff98c1 (patch) | |
| tree | d4694a464519bd3eb932c439355fefec27ee996d /Cydia.app | |
| parent | 22f8bed9669aee2b33cbc4da49eea3106e91c338 (diff) | |
Fixed an XHTML issue, finished confirmation Javascript, and finally enhanced Test script.
Diffstat (limited to 'Cydia.app')
| -rwxr-xr-x | Cydia.app/Test | 10 | ||||
| -rw-r--r-- | Cydia.app/confirm.html | 12 | ||||
| -rw-r--r-- | Cydia.app/confirm.js | 66 | ||||
| -rw-r--r-- | Cydia.app/loading.html | 2 |
4 files changed, 60 insertions, 30 deletions
diff --git a/Cydia.app/Test b/Cydia.app/Test index ad27eeb..5bfd090 100755 --- a/Cydia.app/Test +++ b/Cydia.app/Test @@ -1,6 +1,8 @@ #!/bin/bash +killall Cydia_ set -e -Cydia=$(dirname "$0") -rsync -SPaz saurik@carrier.saurik.com:menes/cydia/Cydia "${Cydia}"/Cydia_ -chmod +s "${Cydia}"/Cydia_ -#NSZombieEnabled=YES su -c "${Cydia}"/Cydia_ mobile +rsync -SPaz --copy-links saurik@carrier.saurik.com:menes/cydia/cydia_iphoneos-arm.deb . +dpkg -i cydia_iphoneos-arm.deb +touch /tmp/cydia.log +openURL "${1-cydia://}" +exec tail /tmp/cydia.log -fn0 diff --git a/Cydia.app/confirm.html b/Cydia.app/confirm.html index 55fec23..b1fc0dc 100644 --- a/Cydia.app/confirm.html +++ b/Cydia.app/confirm.html @@ -6,11 +6,15 @@ <link rel="stylesheet" type="text/css" href="menes/style.css"/> <script type="text/javascript" src="menes/menes.js"></script> <script type="text/javascript" src="confirm.js"></script> -</head><body> -<dialog><panel> +</head><body class="pinstripe"> +<dialog><panel id="issues"> -<label>Statistics</label> -<fieldset> +<fieldset class="issues"> + <div><p><span style="color: red; font-weight: bold">Note:</span> The requested modifications cannot be applied due to required dependencies or conflicts that cannot be automatically found or fixed.</p></div> +</fieldset> + +<label class="_issues">Statistics</label> +<fieldset class="_issues"> <div class="downloading"> <label>Downloading</label> <div id="downloading"></div> diff --git a/Cydia.app/confirm.js b/Cydia.app/confirm.js index 09a121c..9210295 100644 --- a/Cydia.app/confirm.js +++ b/Cydia.app/confirm.js @@ -1,28 +1,52 @@ $(function () { - var downloading = sizes[0]; - if (downloading == "0.0 B") - $(".downloading").remove(); - else - $("#downloading").html($.xml(downloading)); + if (issues == null) { + $(".issues").remove(); - var resuming = sizes[1]; - if (resuming == "0.0 B") - $(".resuming").remove(); - else + var downloading = sizes[0]; + if (downloading == "0.0 B") + $(".downloading").remove(); + else + $("#downloading").html($.xml(downloading)); + + var resuming = sizes[1]; + if (resuming == "0.0 B") + $(".resuming").remove(); + else $("#resuming").html($.xml(resuming)); - var size = sizes[2]; - var negative; + var size = sizes[2]; + var negative; - if (size.charAt(0) != '-') - negative = false; - else { - negative = true; - size = size.substr(1); - } + if (size.charAt(0) != '-') + negative = false; + else { + negative = true; + size = size.substr(1); + } + + $("#disk-key").html(negative ? "Disk Freeing" : "Disk Using"); + $("#disk-value").html($.xml(size)); + } else for (var i = 0; i != issues.length; ++i) { + $("._issues").remove(); - $("#disk-key").html(negative ? "Disk Freeing" : "Disk Using"); - $("#disk-value").html($.xml(size)); + var issue = issues[i]; + + $("#issues").append( + "<label style=\"color: #704d4d\">" + issue[0] + "</label>" + + "<fieldset style=\"background-color: #dddddd\" class=\"clearfix\" id=\"i" + i + "\"></fieldset>" + ); + + for (var j = 1; j != issue.length; ++j) { + var entry = issue[j]; + var type = entry[0]; + if (type == "PreDepends") + type = "Depends"; + $("#i" + i).append("<div>" + + "<label>" + type + "</label>" + + "<div>" + entry[1] + " " + entry[3] + "</div>" + + "</div>"); + } + } var keys = [ "Install", @@ -39,7 +63,7 @@ $(function () { if (length != 0) { $("#modifications").append("<div class=\"clearfix\">" + "<label>" + keys[i] + "</label>" + - "<div id=\"i" + i + "\"></div>" + + "<div id=\"c" + i + "\"></div>" + "</div>"); var value = ""; @@ -49,7 +73,7 @@ $(function () { value += $.xml(list[j]); } - $("#i" + i).html(value); + $("#c" + i).html(value); } } }); diff --git a/Cydia.app/loading.html b/Cydia.app/loading.html index 85cc4c5..33b2637 100644 --- a/Cydia.app/loading.html +++ b/Cydia.app/loading.html @@ -7,7 +7,7 @@ <base target="_blank"/> </head><body> <div style="padding: 5px 7px"> - <span style="color: #4d4d70; font-weight: normal; font-size: 16px"/> + <span style="color: #4d4d70; font-weight: normal; font-size: 16px"> <div style="display: inline-block; background-image: url(menes/indicator-c7ced5-4d4d70.gif); width: 16px; height: 16px; margin: 2px 0 -2px 0"></div> <span style="margin: 0 4px">Loading...</span> </span> |