Commits

Mike Hatfield committed b71ea74 Merge

Merge branch 'topic-1.2.2-retina' into release-1.2.2-dev

Comments (0)

Files changed (13)

FreshDocs.xcodeproj/project.pbxproj

 		270E44B4153FB2F600BF8E8A /* help-guide.png in Resources */ = {isa = PBXBuildFile; fileRef = 270E44B1153FB2F600BF8E8A /* help-guide.png */; };
 		270E44B5153FB2F600BF8E8A /* help-guide@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 270E44B2153FB2F600BF8E8A /* help-guide@2x.png */; };
 		270E44B6153FB2F600BF8E8A /* help-guide@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 270E44B2153FB2F600BF8E8A /* help-guide@2x.png */; };
-		27119503152C8F8900A68DC4 /* About-Logo@2x~iPad.png in Resources */ = {isa = PBXBuildFile; fileRef = 27119502152C8F8900A68DC4 /* About-Logo@2x~iPad.png */; };
 		2711950A152C8FB700A68DC4 /* no-document-selected@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 27119509152C8FB700A68DC4 /* no-document-selected@2x.png */; };
 		2711950C152C8FC800A68DC4 /* SplashScreen@2x~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = 2711950B152C8FC800A68DC4 /* SplashScreen@2x~ipad.png */; };
 		271A3748153F31D2001662E3 /* HelpRowRender.m in Sources */ = {isa = PBXBuildFile; fileRef = 271A3747153F31D2001662E3 /* HelpRowRender.m */; };
 		2727717A153F1F360087016E /* HelpGuidesDataSource.m in Sources */ = {isa = PBXBuildFile; fileRef = 27277178153F1F360087016E /* HelpGuidesDataSource.m */; };
 		272B7032152CAEB1004BB0B5 /* Default-Portrait@2x~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = 272B7031152CAEB1004BB0B5 /* Default-Portrait@2x~ipad.png */; };
 		2773AEB4153453F900F23464 /* zia-partner--logo-large@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 2773AEB3153453F900F23464 /* zia-partner--logo-large@2x.png */; };
+		2796655D1548F69300744348 /* AboutLogo.png in Resources */ = {isa = PBXBuildFile; fileRef = 279665591548F69300744348 /* AboutLogo.png */; };
+		2796655E1548F69300744348 /* AboutLogo@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 2796655A1548F69300744348 /* AboutLogo@2x.png */; };
+		2796655F1548F69300744348 /* AboutLogo@2x~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = 2796655B1548F69300744348 /* AboutLogo@2x~ipad.png */; };
+		279665601548F69300744348 /* AboutLogo~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = 2796655C1548F69300744348 /* AboutLogo~ipad.png */; };
 		27A3A926152CAFE700F7ABA9 /* Default-Landscape@2x~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = 27A3A925152CAFE700F7ABA9 /* Default-Landscape@2x~ipad.png */; };
 		27AE7F3415457D7F00675EC0 /* close-button.png in Resources */ = {isa = PBXBuildFile; fileRef = 27AE7F3215457D7F00675EC0 /* close-button.png */; };
 		27AE7F3515457D7F00675EC0 /* close-button@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 27AE7F3315457D7F00675EC0 /* close-button@2x.png */; };
 		AA7F9D89144D0F5C0047FA9F /* App.plist in Resources */ = {isa = PBXBuildFile; fileRef = AA7F9D5C144D0F5B0047FA9F /* App.plist */; };
 		AA7F9D8B144D0F5C0047FA9F /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = AA7F9D5D144D0F5B0047FA9F /* InfoPlist.strings */; };
 		AA7F9D8D144D0F5C0047FA9F /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = AA7F9D5F144D0F5B0047FA9F /* Localizable.strings */; };
-		AA7F9D8F144D0F5C0047FA9F /* About-Logo.png in Resources */ = {isa = PBXBuildFile; fileRef = AA7F9D63144D0F5B0047FA9F /* About-Logo.png */; };
-		AA7F9D91144D0F5C0047FA9F /* About-Logo@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = AA7F9D64144D0F5B0047FA9F /* About-Logo@2x.png */; };
-		AA7F9D93144D0F5C0047FA9F /* About-Logo~iPad.png in Resources */ = {isa = PBXBuildFile; fileRef = AA7F9D65144D0F5B0047FA9F /* About-Logo~iPad.png */; };
 		AA7F9D95144D0F5C0047FA9F /* about-more.png in Resources */ = {isa = PBXBuildFile; fileRef = AA7F9D66144D0F5B0047FA9F /* about-more.png */; };
 		AA7F9D97144D0F5C0047FA9F /* about-more@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = AA7F9D67144D0F5B0047FA9F /* about-more@2x.png */; };
 		AA7F9D99144D0F5C0047FA9F /* zia-partner--logo-large.png in Resources */ = {isa = PBXBuildFile; fileRef = AA7F9D68144D0F5B0047FA9F /* zia-partner--logo-large.png */; };
 		270E44AB153FAB1600BF8E8A /* en */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; name = en; path = en.lproj/GettingStarted.pdf; sourceTree = "<group>"; };
 		270E44B1153FB2F600BF8E8A /* help-guide.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "help-guide.png"; sourceTree = "<group>"; };
 		270E44B2153FB2F600BF8E8A /* help-guide@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "help-guide@2x.png"; sourceTree = "<group>"; };
-		27119502152C8F8900A68DC4 /* About-Logo@2x~iPad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "About-Logo@2x~iPad.png"; sourceTree = "<group>"; };
 		27119509152C8FB700A68DC4 /* no-document-selected@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "no-document-selected@2x.png"; sourceTree = "<group>"; };
 		2711950B152C8FC800A68DC4 /* SplashScreen@2x~ipad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "SplashScreen@2x~ipad.png"; sourceTree = "<group>"; };
 		271A3746153F31D2001662E3 /* HelpRowRender.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HelpRowRender.h; path = "UserInterface/View Controllers/Help/Row Render/HelpRowRender.h"; sourceTree = "<group>"; };
 		27277178153F1F360087016E /* HelpGuidesDataSource.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = HelpGuidesDataSource.m; path = "UserInterface/View Controllers/Help/DataSource/HelpGuidesDataSource.m"; sourceTree = "<group>"; };
 		272B7031152CAEB1004BB0B5 /* Default-Portrait@2x~ipad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-Portrait@2x~ipad.png"; sourceTree = "<group>"; };
 		2773AEB3153453F900F23464 /* zia-partner--logo-large@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "zia-partner--logo-large@2x.png"; sourceTree = "<group>"; };
+		279665591548F69300744348 /* AboutLogo.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = AboutLogo.png; sourceTree = "<group>"; };
+		2796655A1548F69300744348 /* AboutLogo@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "AboutLogo@2x.png"; sourceTree = "<group>"; };
+		2796655B1548F69300744348 /* AboutLogo@2x~ipad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "AboutLogo@2x~ipad.png"; sourceTree = "<group>"; };
+		2796655C1548F69300744348 /* AboutLogo~ipad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "AboutLogo~ipad.png"; sourceTree = "<group>"; };
 		27A3A925152CAFE700F7ABA9 /* Default-Landscape@2x~ipad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-Landscape@2x~ipad.png"; sourceTree = "<group>"; };
 		27AE7F3215457D7F00675EC0 /* close-button.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "close-button.png"; sourceTree = "<group>"; };
 		27AE7F3315457D7F00675EC0 /* close-button@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "close-button@2x.png"; sourceTree = "<group>"; };
 		AA7F9D5C144D0F5B0047FA9F /* App.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = App.plist; sourceTree = "<group>"; };
 		AA7F9D5E144D0F5B0047FA9F /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		AA7F9D60144D0F5B0047FA9F /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Localizable.strings; sourceTree = "<group>"; };
-		AA7F9D63144D0F5B0047FA9F /* About-Logo.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "About-Logo.png"; sourceTree = "<group>"; };
-		AA7F9D64144D0F5B0047FA9F /* About-Logo@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "About-Logo@2x.png"; sourceTree = "<group>"; };
-		AA7F9D65144D0F5B0047FA9F /* About-Logo~iPad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "About-Logo~iPad.png"; sourceTree = "<group>"; };
 		AA7F9D66144D0F5B0047FA9F /* about-more.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "about-more.png"; sourceTree = "<group>"; };
 		AA7F9D67144D0F5B0047FA9F /* about-more@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "about-more@2x.png"; sourceTree = "<group>"; };
 		AA7F9D68144D0F5B0047FA9F /* zia-partner--logo-large.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "zia-partner--logo-large.png"; sourceTree = "<group>"; };
 		AA7F9D62144D0F5B0047FA9F /* About */ = {
 			isa = PBXGroup;
 			children = (
-				AA7F9D63144D0F5B0047FA9F /* About-Logo.png */,
-				AA7F9D64144D0F5B0047FA9F /* About-Logo@2x.png */,
-				AA7F9D65144D0F5B0047FA9F /* About-Logo~iPad.png */,
-				27119502152C8F8900A68DC4 /* About-Logo@2x~iPad.png */,
+				279665591548F69300744348 /* AboutLogo.png */,
+				2796655A1548F69300744348 /* AboutLogo@2x.png */,
+				2796655B1548F69300744348 /* AboutLogo@2x~ipad.png */,
+				2796655C1548F69300744348 /* AboutLogo~ipad.png */,
 				AA7F9D66144D0F5B0047FA9F /* about-more.png */,
 				AA7F9D67144D0F5B0047FA9F /* about-more@2x.png */,
 				AA7F9D69144D0F5B0047FA9F /* zia-partner--logo-small.png */,
 				AA7F9D89144D0F5C0047FA9F /* App.plist in Resources */,
 				AA7F9D8B144D0F5C0047FA9F /* InfoPlist.strings in Resources */,
 				AA7F9D8D144D0F5C0047FA9F /* Localizable.strings in Resources */,
-				AA7F9D8F144D0F5C0047FA9F /* About-Logo.png in Resources */,
-				AA7F9D91144D0F5C0047FA9F /* About-Logo@2x.png in Resources */,
-				AA7F9D93144D0F5C0047FA9F /* About-Logo~iPad.png in Resources */,
 				AA7F9D95144D0F5C0047FA9F /* about-more.png in Resources */,
 				AA7F9D97144D0F5C0047FA9F /* about-more@2x.png in Resources */,
 				AA7F9D99144D0F5C0047FA9F /* zia-partner--logo-large.png in Resources */,
 				3C8777CF15267C2F009FB8CB /* home-screen-account@2x.png in Resources */,
 				3C8777D115267C2F009FB8CB /* home-screen-cloud.png in Resources */,
 				3C8777D315267C2F009FB8CB /* home-screen-cloud@2x.png in Resources */,
-				27119503152C8F8900A68DC4 /* About-Logo@2x~iPad.png in Resources */,
 				2711950A152C8FB700A68DC4 /* no-document-selected@2x.png in Resources */,
 				2711950C152C8FC800A68DC4 /* SplashScreen@2x~ipad.png in Resources */,
 				272B7032152CAEB1004BB0B5 /* Default-Portrait@2x~ipad.png in Resources */,
 				27AE7F3515457D7F00675EC0 /* close-button@2x.png in Resources */,
 				27D79FA91546C84A00AC1819 /* SplashScreenViewController.xib in Resources */,
 				27D79FAC1546CEB000AC1819 /* SplashScreenViewController~iPad.xib in Resources */,
+				2796655D1548F69300744348 /* AboutLogo.png in Resources */,
+				2796655E1548F69300744348 /* AboutLogo@2x.png in Resources */,
+				2796655F1548F69300744348 /* AboutLogo@2x~ipad.png in Resources */,
+				279665601548F69300744348 /* AboutLogo~ipad.png in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

Resources-Branding/Alfresco/AboutView.xib

 								<reference key="IBUINormalTitleShadowColor" ref="857626975"/>
 								<object class="NSCustomResource" key="IBUINormalImage">
 									<string key="NSClassName">NSImage</string>
-									<string key="NSResourceName">About-Logo.png</string>
+									<string key="NSResourceName">AboutLogo.png</string>
 								</object>
 								<reference key="IBUIFontDescription" ref="1022648099"/>
 								<reference key="IBUIFont" ref="690384853"/>
 								<string key="NSFrame">{{58, 337}, {204, 18}}</string>
 								<reference key="NSSuperview" ref="1051192674"/>
 								<reference key="NSWindow"/>
-								<reference key="NSNextKeyView"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClipsSubviews">YES</bool>
 								<int key="IBUIContentMode">11</int>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
 		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
-			<string key="About-Logo.png">{200, 46}</string>
+			<string key="AboutLogo.png">{200, 46}</string>
 			<string key="zia-partner--logo-small.png">{171, 36}</string>
 		</dictionary>
 		<string key="IBCocoaTouchPluginVersion">1181</string>

Resources-Branding/Alfresco/AboutView~iPad.xib

 						<string key="NSFrame">{{20, 873}, {728, 18}}</string>
 						<reference key="NSSuperview" ref="660164135"/>
 						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView"/>
 						<bool key="IBUIOpaque">NO</bool>
 						<bool key="IBUIClipsSubviews">YES</bool>
 						<bool key="IBUIUserInteractionEnabled">NO</bool>
 						<reference key="IBUINormalTitleShadowColor" ref="562109195"/>
 						<object class="NSCustomResource" key="IBUINormalImage">
 							<string key="NSClassName">NSImage</string>
-							<string key="NSResourceName">About-Logo~iPad.png</string>
+							<string key="NSResourceName">AboutLogo~ipad.png</string>
 						</object>
 						<object class="IBUIFontDescription" key="IBUIFontDescription" id="177169530">
 							<string key="name">Helvetica-Bold</string>
 			<bool key="EncodedWithXMLCoder">YES</bool>
 			<object class="NSArray" key="dict.sortedKeys">
 				<bool key="EncodedWithXMLCoder">YES</bool>
-				<string>About-Logo~iPad.png</string>
+				<string>AboutLogo~ipad.png</string>
 				<string>zia-partner--logo-large.png</string>
 			</object>
 			<object class="NSArray" key="dict.values">

Resources-Branding/Alfresco/Images/About/About-Logo.png

Removed
Old image

Resources-Branding/Alfresco/Images/About/About-Logo@2x.png

Removed
Old image

Resources-Branding/Alfresco/Images/About/About-Logo@2x~iPad.png

Removed
Old image

Resources-Branding/Alfresco/Images/About/About-Logo~iPad.png

Removed
Old image

Resources-Branding/Alfresco/Images/About/AboutLogo.png

Added
New image

Resources-Branding/Alfresco/Images/About/AboutLogo@2x.png

Added
New image

Resources-Branding/Alfresco/Images/About/AboutLogo@2x~ipad.png

Added
New image

Resources-Branding/Alfresco/Images/About/AboutLogo~ipad.png

Added
New image

Resources/HomeScreenViewController.xib

 										<string key="targetRuntimeIdentifier">IBIPadFramework</string>
 										<object class="NSCustomResource" key="IBUIImage">
 											<string key="NSClassName">NSImage</string>
-											<string key="NSResourceName">About-Logo.png</string>
+											<string key="NSResourceName">AboutLogo.png</string>
 										</object>
 									</object>
 									<object class="IBUILabel" id="528099819">
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
 		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
-			<string key="About-Logo.png">{200, 46}</string>
+			<string key="AboutLogo.png">{200, 46}</string>
 			<string key="close-button.png">{29, 29}</string>
 			<string key="home-screen-account.png">{26, 51}</string>
 			<string key="home-screen-cloud.png">{65, 45}</string>

Resources/HomeScreenViewController~iPad.xib

 						<string key="targetRuntimeIdentifier">IBIPadFramework</string>
 						<object class="NSCustomResource" key="IBUIImage">
 							<string key="NSClassName">NSImage</string>
-							<string key="NSResourceName">About-Logo~iPad.png</string>
+							<string key="NSResourceName">AboutLogo~ipad.png</string>
 						</object>
 					</object>
 					<object class="IBUILabel" id="123900388">
 						<string key="NSFrame">{{293, 648}, {438, 72}}</string>
 						<reference key="NSSuperview" ref="191373211"/>
 						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView"/>
 						<string key="NSReuseIdentifierKey">_NS:212</string>
 						<object class="NSColor" key="IBUIBackgroundColor">
 							<int key="NSColorSpace">3</int>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
 		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
-			<string key="About-Logo~iPad.png">{550, 127}</string>
+			<string key="AboutLogo~ipad.png">{550, 127}</string>
 			<string key="close-button.png">{29, 29}</string>
 			<string key="home-screen-account.png">{26, 51}</string>
 			<string key="home-screen-cloud.png">{65, 45}</string>