Checkpoint before final completion.

6 files changed, 64 insertions, 45 deletions

diff --git a/Cydia.app/Default.png b/Cydia.app/Default.png
index 3c7762c..ca46fda 100644
--- a/Cydia.app/Default.png
+++ b/Cydia.app/Default.png
diff --git a/Cydia.app/Sections.plist b/Cydia.app/Sections.plist
index 5b03a42..f5e8797 100644
--- a/Cydia.app/Sections.plist
+++ b/Cydia.app/Sections.plist
@@ -39,12 +39,6 @@
         <string>Carrier_Bundles</string>
     </dict>
 
-    <key>Keyboard_Extension</key>
-    <dict>
-        <key>Rename</key>
-        <string>Keyboard_Extensions</string>
-    </dict>
-
     <key>Messageing</key>
     <dict>
         <key>Rename</key>
diff --git a/Cydia.app/Sections/Keyboard Extensions.png b/Cydia.app/Sections/Keyboards.png
index 6b3df89..6b3df89 100644
--- a/Cydia.app/Sections/Keyboard Extensions.png
+++ b/Cydia.app/Sections/Keyboards.png
diff --git a/Cydia.app/menes/style.css b/Cydia.app/menes/style.css
index 174312f..61a53df 100644
--- a/Cydia.app/menes/style.css
+++ b/Cydia.app/menes/style.css
@@ -181,9 +181,17 @@ dialog > toolbar > a.forward-button {
 /* }}} */
 
 panel > block {
-    background-color: #c7ced5;
+    /*background-color: #ccd1d5;*/
+    /*background-color: white;*/
+    /*background-color: #c7ced5;*/
+    background-color: transparent;
+    //background-color: #ffffff;
     border-bottom: 1px solid #999999;
     border-top: 1px solid #999999;
+    border-left: 1px dotted #999999;
+    border-right: 1px dotted #999999;
+    -webkit-border-radius: 9px;
+    //border: 1px solid #999999;
     display: block;
     font-size: 16px;
     margin: 9px 10px;
@@ -267,11 +275,6 @@ fieldset > textarea {
     padding: 12px 14px 10px 14px;
 }
 
-fieldset > a:not([type="ad"]):first-child,
-fieldset > div:first-child {
-    padding-top: 13px;
-}
-
 /*fieldset > a:not([type="ad"]):last-child,
 fieldset > div:last-child {
     padding-bottom: 10px;
@@ -312,7 +315,7 @@ panel > fieldset > a[type="comment"] > div:first-of-type {
 }
 
 panel > fieldset > a[type="profile"] > div:first-of-type,
-panel > fieldset > a[type="thumb"] > div:first-of-type {
+panel > fieldset:not(.header) > a[type="thumb"] > div:first-of-type {
     border: 1px solid #999999;
 }
 
@@ -352,7 +355,13 @@ fieldset > a[type="comment"] > div:first-of-type {
     width: 44px;
 }
 
+fieldset > a[type="header"] > div:first-of-type {
+    height: 64px;
+    width: 64px;
+}
+
 fieldset > a[type="profile"] > div:first-of-type {
+    -webkit-background-size: 50px;
     height: 50px;
     width: 50px;
 }
@@ -363,6 +372,7 @@ fieldset > a[type="thumb"] > div:first-of-type  {
 }
 
 fieldset > a[type="comment"] > div:first-of-type,
+fieldset > a[type="header"] > div:first-of-type,
 fieldset > a[type="profile"] > div:first-of-type,
 fieldset > a[type="thumb"] > div:first-of-type {
     background-repeat: no-repeat;
@@ -370,7 +380,7 @@ fieldset > a[type="thumb"] > div:first-of-type {
     display: inline-block;
     /* XXX: small differences due to font bugs */
     /* XXX: 1px difference due to border stupidity */
-    margin: -14px 7px -11px -15px;
+    margin: -13px 7px -11px -15px;
 }
 
 fieldset > a > img.icon,
@@ -517,11 +527,12 @@ fieldset > a:not([type]) > div {
     width: 250px;
 }
 
+fieldset > a:not([href]) > img.icon + div,
 fieldset > div > img.icon + div {
     width: 244px;
 }
 
-fieldset > a > img.icon + div {
+fieldset > a[href] > img.icon + div {
     width: 221px;
 }
 
@@ -560,7 +571,7 @@ fieldset > a[type="thumb"] > div:nth-of-type(2) {
 }
 
 fieldset > a[type="profile"] > div:nth-of-type(2) {
-    margin: -6px 0 -5px 0;
+    margin: -5px 0;
 }
 
 fieldset > a[type="profile"] > div:nth-of-type(2),
@@ -721,7 +732,11 @@ panel.centered > label {
 }
 
 panel > iframe {
-    margin: -8px 0;
+    margin: -9px 0;
+}
+
+panel > iframe + iframe {
+    margin-top: 0;
 }
 
 /* Rating Stars {{{ */
@@ -776,3 +791,14 @@ panel > iframe {
     position: absolute;
 }
 /* }}} */
+
+panel > fieldset.header {
+    background-color: transparent;
+    border: none;
+    margin: -5px 0 -11px 0;
+}
+
+panel > fieldset.header > a > div > label {
+    color: #4d4d70;
+    text-shadow: rgba(255, 255, 255, 0.75) 1px 1px 0;
+}
diff --git a/Cydia.app/package.html b/Cydia.app/package.html
index dbf5586..4dc34a8 100644
--- a/Cydia.app/package.html
+++ b/Cydia.app/package.html
@@ -61,18 +61,6 @@
             top: -5px;
         }
 
-        #depiction {
-            margin: -8px 0;
-            overflow: hidden;
-            width: 320px;
-        }
-
-        #notice {
-            margin: -8px 0 -9px 0;
-            overflow: hidden;
-            width: 320px;
-        }
-
         #remove > a {
             color: #335588;
             text-decoration: none;
@@ -260,13 +248,23 @@
     </div></div>
 </fieldset>
 
-<div id="notice" class="notice"><iframe
+<!--iframe
+    class="notice"
     id="notice-src"
     frameborder="0"
     width="320"
     height="0"
     target="_top"
-></iframe></div>
+></iframe-->
+
+<!--iframe
+    class="activation"
+    id="activation-src"
+    frameborder="0"
+    width="320"
+    height="0"
+    target="_top"
+></iframe-->
 
 <!--div id="remove" class="depiction">
     <a href="javascript:remove()">Remove Custom Depiction</a>
@@ -274,14 +272,15 @@
 
 <hr id="upper-bar" class="depiction"/-->
 
-<div id="depiction" class="depiction"><iframe
+<iframe
+    class="depiction"
     id="depiction-src"
     frameborder="0"
     width="320"
     height="0"
     target="_top"
     onload_="loaded()"
-></iframe></div>
+></iframe>
 
 <!--hr id="lower-bar" class="depiction"/-->
 
diff --git a/Cydia.app/package.js b/Cydia.app/package.js
index c3b361c..200be8b 100644
--- a/Cydia.app/package.js
+++ b/Cydia.app/package.js
@@ -63,7 +63,7 @@ $(function () {
     $("#name").html(name);
     space("#latest", package.latest, 96);
 
-    $.xhr((api + 'package_/' + idc), 'GET', {}, null, {
+    $.xhr(cache(api + 'package/' + idc), 'GET', {}, null, {
         success: function (value) {
             value = eval(value);
 
@@ -145,19 +145,11 @@ $(function () {
         }
     }*/
 
-    var purposes = package.purposes;
-    var commercial = false;
-    var _console = false;
-    if (purposes != null)
-        for (var i = 0, e = purposes.length; i != e; ++i) {
-            var purpose = purposes[i];
-            if (purpose == "commercial")
-                commercial = true;
-            else if (purpose == "console")
-                _console = true;
-        }
+    var commercial = package.hasTag('cydia::commercial');
     if (!commercial)
         $(".commercial").remove();
+
+    var _console = package.hasTag('purpose::console');
     if (!_console)
         $(".console").remove();
 
@@ -174,6 +166,14 @@ $(function () {
 
     //$("#notice-src").src("http://saurik.cachefly.net/notice/" + idc + ".html");
 
+    /*var store = commercial;
+    if (!store)
+        $(".activation").remove();
+    else {
+        var activation = api + 'activation/' + idc;
+        $("#activation-src").src(activation);
+    }*/
+
     var depiction = package.depiction;
     if (depiction == null)
         $(".depiction").remove();