Merge branch 'Munki2' of https://code.google.com/r/christophergrande-munkidev into Munki2

code/Managed Software Center/Managed Software Center/WebResources/base.css

@@ -894,7 +894,7 @@ div.msu-button button {
     -webkit-border-radius: 0;
     -webkit-font-smoothing: antialiased;
     padding: 0;
-    margin: 4px 0 0 0;
+    margin: 0 0 0 0;
     background: 0;
     border: 0;
     text-align: center;
@@ -941,6 +941,10 @@ div.msu-button.install-updates {
     float: right;
 }
 
+div.msu-button.install-updates.in-header {
+    margin-top: -2px;
+}
+
 div.msu-button-inner.install-updates {
     height: 23px;
     position: relative;
@@ -1087,7 +1091,7 @@ div.progress-spinner {
     float: left;
     position: relative;
     top: 6px;
-    left: -10px;
+    left: -14px;
 }
 
 p[data-text-truncate-lines] {

code/Managed Software Center/Managed Software Center/WebResources/updates.css

@@ -61,6 +61,11 @@ div.installations th {
     display: block;
     line-height: 32px
 }
+
+#update-count-string {
+    margin-left: -10px
+}
+
 div.installations th:first-child {
     -webkit-border-top-left-radius: 5px
 }
@@ -83,7 +88,7 @@ div.installations tbody tr:nth-of-type(even) {
 }
 .installation div.artwork {
     position: absolute;
-    margin-top: 2px
+    margin-top: 3px
 }
 .installation img.artwork {
     height: auto;
@@ -123,7 +128,8 @@ div.installations tbody tr:nth-of-type(even) {
 #other-updates #os-updates,#os-and-app-updates #os-updates,
 #os-and-app-updates #app-updates, div.subscribed-items {
     margin: 0;
-    -webkit-border-radius: 0;
+    -webkit-border-top-left-radius: 0px;
+    -webkit-border-top-right-radius: 0px;
     -webkit-box-shadow: none
 }
 #other-updates #os-updates,#os-and-app-updates #os-updates {
@@ -407,6 +413,7 @@ div.os-updates.expanded tbody tr.sosumi:before {
 body.scanning .non-scan-progress,body.page-not-ready .non-scan-progress,body:not(.scanning):not(.page-not-ready) .scan-progress {
     display: none
 }
+
 .activity-indicator {
     -webkit-animation-name: rotatingLoader;
     -webkit-animation-duration: .75s;
@@ -551,8 +558,7 @@ div.progress > span {
     height: 100%;
     padding: 0 2px;
     margin: 0 -2px;
-    -webkit-border-top-left-radius: 4px;
-    -webkit-border-bottom-left-radius: 4px;
+    -webkit-border-radius: 4px;
     -webkit-box-sizing: content-box;
     background: -webkit-gradient(linear,left top,left bottom,from( #4C95DF),to( #3B64C8));
     border-width: 0;
@@ -583,7 +589,7 @@ div.progress > span.indeterminate > span {
     color-stop(.25, transparent), color-stop(.5, transparent), 
     color-stop(.5, rgba(255, 255, 255, .9)), 
     color-stop(.75, rgba(255, 255, 255, .9)), 
-    color-stop(.75, transparent), to(transparent)
+    color-stop(.76, transparent), to(transparent)
     );
     z-index: 1;
     -webkit-background-size: 20px 20px;

code/Managed Software Center/Managed Software Center/templates/updates_template.html

@@ -32,7 +32,7 @@
                                                 ${warning_text}
                                             </span>
                                             <div class='progress-spinner ${hide_progress_spinner}' id="updates-progress-spinner"></div>
-                                            <div class="msu-button install-updates">
+                                            <div class="msu-button install-updates in-header">
                                                 <button class="button-area uppercase"
                                                     onClick="window.AppController.installButtonClicked();">
                                                     <div class="msu-button-inner install-updates ${install_all_button_classes}"

code/MunkiStatus/MunkiStatus/en.lproj/MainMenu.xib

@@ -169,7 +169,7 @@
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <button verticalHuggingPriority="750" id="rxM-GK-Unu">
-                        <rect key="frame" x="387" y="12" width="131" height="32"/>
+                        <rect key="frame" x="389" y="13" width="131" height="32"/>
                         <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
                         <buttonCell key="cell" type="push" title="Stop" bezelStyle="rounded" alignment="center" refusesFirstResponder="YES" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="M20-JG-Pmr">
                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>

code/tools/make_munki_mpkg.sh

@@ -25,7 +25,7 @@ PARENTDIRNAME=`basename $PARENTDIR`
 if [ "$PARENTDIRNAME" == "code" ]; then
     GRANDPARENTDIR=`dirname $PARENTDIR`
     GRANDPARENTDIRNAME=`basename $GRANDPARENTDIR`
-    if [ "$GRANDPARENTDIRNAME" == "munki" ]; then
+    if [ "$GRANDPARENTDIRNAME" == "Munki2" ]; then
         MUNKIROOT="$GRANDPARENTDIR"
     fi
 fi