diff --git a/openbis-ipad/openBIS/openBIS.xcodeproj/project.pbxproj b/openbis-ipad/openBIS/openBIS.xcodeproj/project.pbxproj
index 31fc5ccfb0e0379ec439981d8d0b62b843aaa5bc..35beb73c97bb4a09ef97f504a07277f1e8b14ad4 100644
--- a/openbis-ipad/openBIS/openBIS.xcodeproj/project.pbxproj
+++ b/openbis-ipad/openBIS/openBIS.xcodeproj/project.pbxproj
@@ -10,6 +10,7 @@
3605B05C1653EE8500CEC7F8 /* Settings.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 3605B05B1653EE8500CEC7F8 /* Settings.bundle */; };
362B81EC163FFB6C00127554 /* CISDOBIpadServiceManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 362B81EB163FFB6C00127554 /* CISDOBIpadServiceManager.m */; };
364D509E161C6ADB00A739B0 /* openBISData.sqlite in Resources */ = {isa = PBXBuildFile; fileRef = 364D509C161C6ADB00A739B0 /* openBISData.sqlite */; };
+ 3656C9B4165A7A7E00E9B0FA /* CISDOBImageViewPopoverController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3656C9B3165A7A7E00E9B0FA /* CISDOBImageViewPopoverController.m */; };
3687D8FF162D3AB500622690 /* openbis-icon-72.png in Resources */ = {isa = PBXBuildFile; fileRef = 3687D8FD162D3AB500622690 /* openbis-icon-72.png */; };
3687D900162D3AB500622690 /* openbis-icon-144.png in Resources */ = {isa = PBXBuildFile; fileRef = 3687D8FE162D3AB500622690 /* openbis-icon-144.png */; };
36BDE60016555869007EC62A /* CISDOBLoginViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 36BDE5FF16555869007EC62A /* CISDOBLoginViewController.m */; };
@@ -81,6 +82,8 @@
362B81EB163FFB6C00127554 /* CISDOBIpadServiceManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CISDOBIpadServiceManager.m; sourceTree = "<group>"; };
364D5098161C6A3600A739B0 /* readme.md */ = {isa = PBXFileReference; lastKnownFileType = text; path = readme.md; sourceTree = "<group>"; };
364D509C161C6ADB00A739B0 /* openBISData.sqlite */ = {isa = PBXFileReference; lastKnownFileType = file; path = openBISData.sqlite; sourceTree = "<group>"; };
+ 3656C9B2165A7A7E00E9B0FA /* CISDOBImageViewPopoverController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CISDOBImageViewPopoverController.h; sourceTree = "<group>"; };
+ 3656C9B3165A7A7E00E9B0FA /* CISDOBImageViewPopoverController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CISDOBImageViewPopoverController.m; sourceTree = "<group>"; };
3687D8FD162D3AB500622690 /* openbis-icon-72.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "openbis-icon-72.png"; sourceTree = "<group>"; };
3687D8FE162D3AB500622690 /* openbis-icon-144.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "openbis-icon-144.png"; sourceTree = "<group>"; };
36BDE5FE16555869007EC62A /* CISDOBLoginViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CISDOBLoginViewController.h; sourceTree = "<group>"; };
@@ -220,6 +223,8 @@
36F71E95161C3AE900C87277 /* MainStoryboard_iPad.storyboard */,
36F71E9E161C3AE900C87277 /* CISDOBDetailViewController.h */,
36F71E9F161C3AE900C87277 /* CISDOBDetailViewController.m */,
+ 3656C9B2165A7A7E00E9B0FA /* CISDOBImageViewPopoverController.h */,
+ 3656C9B3165A7A7E00E9B0FA /* CISDOBImageViewPopoverController.m */,
36BDE5FE16555869007EC62A /* CISDOBLoginViewController.h */,
36BDE5FF16555869007EC62A /* CISDOBLoginViewController.m */,
36F71E9B161C3AE900C87277 /* CISDOBMasterViewController.h */,
@@ -473,6 +478,7 @@
36F97A2E1628123F005D063E /* CISDOBOpenBisModel.m in Sources */,
362B81EC163FFB6C00127554 /* CISDOBIpadServiceManager.m in Sources */,
36BDE60016555869007EC62A /* CISDOBLoginViewController.m in Sources */,
+ 3656C9B4165A7A7E00E9B0FA /* CISDOBImageViewPopoverController.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
diff --git a/openbis-ipad/openBIS/openBIS.xcodeproj/project.xcworkspace/xcuserdata/cramakri.xcuserdatad/UserInterfaceState.xcuserstate b/openbis-ipad/openBIS/openBIS.xcodeproj/project.xcworkspace/xcuserdata/cramakri.xcuserdatad/UserInterfaceState.xcuserstate
index 4d9afae619d97d1ae718782dca49548404024a3c..ec172514e523712c1d6b27616dbfc40f6a87b3b0 100644
Binary files a/openbis-ipad/openBIS/openBIS.xcodeproj/project.xcworkspace/xcuserdata/cramakri.xcuserdatad/UserInterfaceState.xcuserstate and b/openbis-ipad/openBIS/openBIS.xcodeproj/project.xcworkspace/xcuserdata/cramakri.xcuserdatad/UserInterfaceState.xcuserstate differ
diff --git a/openbis-ipad/openBIS/openBIS/CISDOBDetailViewController.m b/openbis-ipad/openBIS/openBIS/CISDOBDetailViewController.m
index a2778cef600b8dfe64d4c9ce6aa8d6facad5dae1..fe1db2904fb98f81a532c73e39cb53947ee77d84 100644
--- a/openbis-ipad/openBIS/openBIS/CISDOBDetailViewController.m
+++ b/openbis-ipad/openBIS/openBIS/CISDOBDetailViewController.m
@@ -26,6 +26,7 @@
#import "CISDOBOpenBisModel.h"
#import "CISDOBIpadServiceManager.h"
#import "CISDOBLoginViewController.h"
+#import "CISDOBImageViewPopoverController.h"
@interface NSURLRequest (NSURLRequestDebug)
+ (BOOL)allowsAnyHTTPSCertificateForHost:(NSString *)host;
@@ -97,7 +98,7 @@
BOOL updateWebView = ![self.webView.request.URL isEqual: url];
if (updateWebView) {
// DEBUG -- We will need to switch to getting the data using a NSURLConnection, but for development, it is more convenient to use the request
- NSURLRequest *request = [NSURLRequest requestWithURL: url cachePolicy:NSURLRequestReloadIgnoringLocalCacheData timeoutInterval: 10.f];
+ NSURLRequest *request = [NSURLRequest requestWithURL: url cachePolicy: NSURLRequestReloadIgnoringLocalCacheData timeoutInterval: 10.f];
[self.webView loadRequest: request];
if (self.detailItem.imageUrlString) {
self.webView.hidden = NO;
@@ -133,6 +134,16 @@
CISDOBLoginViewController *loginViewController = ((CISDOBLoginViewController *) segue.destinationViewController);
loginViewController.appDelegate = self.appDelegate;
}
+ if ([@"ImageFullscreen" isEqualToString: segue.identifier]) {
+ CISDOBImageViewPopoverController *imageViewController = ((CISDOBImageViewPopoverController *) segue.destinationViewController);
+ NSURL *imageUrl;
+ if (!self.detailItem.imageUrlString || [self.detailItem.imageUrlString length] == 0) {
+ imageUrl = [NSURL URLWithString: @"about:blank"];
+ } else {
+ imageUrl = [self.openBisModel urlFromUrlString: self.detailItem.imageUrlString];
+ }
+ imageViewController.imageUrl = imageUrl;
+ }
}
#pragma mark - Split view
@@ -287,7 +298,7 @@
#pragma mark - UIWebViewDelegate
- (void)webView:(UIWebView *)webView didFailLoadWithError:(NSError *)error
{
- NSLog(@"Load failed %@", error);
+
}
diff --git a/openbis-ipad/openBIS/openBIS/CISDOBImageViewPopoverController.h b/openbis-ipad/openBIS/openBIS/CISDOBImageViewPopoverController.h
new file mode 100644
index 0000000000000000000000000000000000000000..e70b2dd4637215f801cfcfadc565c4f3c940f0c0
--- /dev/null
+++ b/openbis-ipad/openBIS/openBIS/CISDOBImageViewPopoverController.h
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2012 ETH Zuerich, CISD
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+//
+// CISDOBImageViewPopoverController.h
+// openBIS
+//
+// Created by Ramakrishnan Chandrasekhar on 11/19/12.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface CISDOBImageViewPopoverController : UIViewController
+
+@property (weak, nonatomic) IBOutlet UIWebView *webView;
+@property (copy, nonatomic) NSURL *imageUrl;
+
+@end
diff --git a/openbis-ipad/openBIS/openBIS/CISDOBImageViewPopoverController.m b/openbis-ipad/openBIS/openBIS/CISDOBImageViewPopoverController.m
new file mode 100644
index 0000000000000000000000000000000000000000..b1f09ee8914edfa47e4c4b0f9ccb65b564fb6d16
--- /dev/null
+++ b/openbis-ipad/openBIS/openBIS/CISDOBImageViewPopoverController.m
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2012 ETH Zuerich, CISD
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+//
+// CISDOBImageViewPopoverController.m
+// openBIS
+//
+// Created by Ramakrishnan Chandrasekhar on 11/19/12.
+//
+
+#import "CISDOBImageViewPopoverController.h"
+
+@implementation CISDOBImageViewPopoverController
+
+- (void)viewDidLoad
+{
+ [super viewDidLoad];
+ NSURLRequest *request = [NSURLRequest requestWithURL: self.imageUrl cachePolicy: NSURLRequestUseProtocolCachePolicy timeoutInterval: 10.f];
+ [self.webView loadRequest: request];
+}
+
+@end
diff --git a/openbis-ipad/openBIS/openBIS/en.lproj/MainStoryboard_iPad.storyboard b/openbis-ipad/openBIS/openBIS/en.lproj/MainStoryboard_iPad.storyboard
index 7cc4795172c7791212f8f549e0938978cd823151..55d8e652c1bdc934b40238cda862c2b9fde31b99 100644
--- a/openbis-ipad/openBIS/openBIS/en.lproj/MainStoryboard_iPad.storyboard
+++ b/openbis-ipad/openBIS/openBIS/en.lproj/MainStoryboard_iPad.storyboard
@@ -60,7 +60,6 @@
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstAttribute="height" relation="greaterThanOrEqual" constant="350" type="user" id="7bz-Yw-afd"/>
- <constraint firstAttribute="height" constant="460" id="sE6-JU-7XJ"/>
</constraints>
<prototypes>
<tableViewCell contentMode="scaleToFill" verticalHuggingPriority="1" horizontalCompressionResistancePriority="1000" verticalCompressionResistancePriority="1000" selectionStyle="blue" indentationWidth="10" reuseIdentifier="Property" textLabel="qrE-EN-cse" detailTextLabel="9aq-ke-4ab" style="IBUITableViewCellStyleValue2" id="mfZ-bV-mLK">
@@ -97,32 +96,61 @@
</constraints>
<dataDetectorType key="dataDetectorTypes"/>
</webView>
- <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="H01-Gm-nTe">
- <constraints>
- <constraint firstAttribute="height" constant="27" id="4O8-pX-DfO"/>
- </constraints>
- <fontDescription key="fontDescription" type="system" pointSize="12"/>
- <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
- <nil key="highlightedColor"/>
- </label>
+ <toolbar opaque="NO" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Du1-DN-a8M">
+ <items>
+ <barButtonItem style="plain" id="XMA-G9-CGH">
+ <view key="customView" userInteractionEnabled="NO" contentMode="scaleToFill" id="iLy-GA-rxW">
+ <rect key="frame" x="12" y="6" width="527" height="33"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+ <subviews>
+ <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="xTL-xF-3F3">
+ <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+ <constraints>
+ <constraint firstAttribute="height" constant="21" id="3ah-YY-mCe"/>
+ </constraints>
+ <fontDescription key="fontDescription" type="system" pointSize="12"/>
+ <color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
+ <nil key="highlightedColor"/>
+ </label>
+ </subviews>
+ <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+ <constraints>
+ <constraint firstItem="xTL-xF-3F3" firstAttribute="trailing" secondItem="iLy-GA-rxW" secondAttribute="trailing" type="default" id="Ejn-fN-yPK"/>
+ <constraint firstItem="xTL-xF-3F3" firstAttribute="leading" secondItem="iLy-GA-rxW" secondAttribute="leading" type="default" id="Suw-n8-iOA"/>
+ <constraint firstItem="xTL-xF-3F3" firstAttribute="centerY" secondItem="iLy-GA-rxW" secondAttribute="centerY" type="default" id="gIo-Rm-JYf"/>
+ </constraints>
+ </view>
+ </barButtonItem>
+ <barButtonItem style="plain" systemItem="flexibleSpace" id="0n2-Cb-rbW"/>
+ <barButtonItem title="Zoom Image" id="ZrU-PG-qcH">
+ <connections>
+ <action selector="toggleImageViewMaximization:" destination="4" id="MJw-ZW-Tfx"/>
+ <segue destination="Jth-PN-dE1" kind="popover" identifier="ImageFullscreen" popoverAnchorBarButtonItem="ZrU-PG-qcH" id="Wmu-mK-2m5">
+ <popoverArrowDirection key="popoverArrowDirection" up="YES" down="YES" left="YES" right="YES"/>
+ </segue>
+ </connections>
+ </barButtonItem>
+ </items>
+ </toolbar>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
<constraints>
+ <constraint firstItem="Du1-DN-a8M" firstAttribute="bottom" secondItem="26" secondAttribute="bottom" type="default" id="14y-wU-vCh"/>
<constraint firstItem="bUx-j7-YCF" firstAttribute="top" secondItem="T4E-dH-b3j" secondAttribute="bottom" constant="8" symbolic="YES" type="default" id="34W-Bo-fwe"/>
<constraint firstItem="T4E-dH-b3j" firstAttribute="top" secondItem="gor-tF-mFh" secondAttribute="bottom" constant="8" symbolic="YES" type="default" id="8xN-U9-aRY"/>
<constraint firstItem="T4E-dH-b3j" firstAttribute="leading" secondItem="26" secondAttribute="leading" constant="25" id="AXi-9e-oWq"/>
- <constraint firstItem="H01-Gm-nTe" firstAttribute="leading" secondItem="26" secondAttribute="leading" constant="20" symbolic="YES" type="default" id="DY1-65-VaV"/>
<constraint firstItem="27" firstAttribute="top" secondItem="26" secondAttribute="top" constant="20" symbolic="YES" type="user" id="FD4-HZ-RnC"/>
<constraint firstItem="gor-tF-mFh" firstAttribute="leading" secondItem="26" secondAttribute="leading" constant="20" symbolic="YES" type="default" id="FvH-Wf-aa1"/>
<constraint firstItem="rUU-Fj-t5t" firstAttribute="leading" secondItem="27" secondAttribute="trailing" constant="8" symbolic="YES" type="default" id="GUS-JI-w7u"/>
<constraint firstItem="bUx-j7-YCF" firstAttribute="trailing" secondItem="26" secondAttribute="trailing" type="default" id="J5w-YE-X9r"/>
- <constraint firstAttribute="trailing" secondItem="H01-Gm-nTe" secondAttribute="trailing" constant="20" symbolic="YES" type="default" id="Lh3-fu-ip0"/>
+ <constraint firstItem="Du1-DN-a8M" firstAttribute="leading" secondItem="26" secondAttribute="leading" type="default" id="JBT-1Q-07O"/>
<constraint firstItem="bUx-j7-YCF" firstAttribute="top" secondItem="rUU-Fj-t5t" secondAttribute="bottom" constant="8" symbolic="YES" type="default" id="NfB-38-VMG"/>
<constraint firstItem="rUU-Fj-t5t" firstAttribute="top" secondItem="26" secondAttribute="top" constant="20" symbolic="YES" type="default" id="QCg-PZ-dXE"/>
<constraint firstAttribute="trailing" secondItem="rUU-Fj-t5t" secondAttribute="trailing" constant="20" symbolic="YES" type="default" id="Qpl-Gy-9XI"/>
<constraint firstItem="gor-tF-mFh" firstAttribute="top" secondItem="27" secondAttribute="bottom" constant="8" symbolic="YES" type="default" id="T1F-6Z-kbc"/>
- <constraint firstItem="H01-Gm-nTe" firstAttribute="bottom" secondItem="26" secondAttribute="bottom" type="default" id="ctA-jO-Kum"/>
<constraint firstItem="rUU-Fj-t5t" firstAttribute="leading" secondItem="gor-tF-mFh" secondAttribute="trailing" constant="8" symbolic="YES" type="default" id="lbL-ti-Ku6"/>
+ <constraint firstItem="Du1-DN-a8M" firstAttribute="trailing" secondItem="26" secondAttribute="trailing" type="default" id="nFU-L9-Dya"/>
+ <constraint firstItem="Du1-DN-a8M" firstAttribute="top" secondItem="bUx-j7-YCF" secondAttribute="bottom" type="default" id="nzY-hY-ThJ"/>
<constraint firstItem="bUx-j7-YCF" firstAttribute="leading" secondItem="26" secondAttribute="leading" type="default" id="tBx-gM-VfN"/>
<constraint firstItem="27" firstAttribute="leading" secondItem="26" secondAttribute="leading" constant="20" symbolic="YES" type="default" id="vrS-8t-WFg"/>
</constraints>
@@ -133,7 +161,7 @@
<connections>
<outlet property="identifierLabel" destination="gor-tF-mFh" id="NCy-K7-tLT"/>
<outlet property="propertiesTableView" destination="bUx-j7-YCF" id="QW1-J0-g9j"/>
- <outlet property="statusLabel" destination="H01-Gm-nTe" id="VBB-z9-EV9"/>
+ <outlet property="statusLabel" destination="xTL-xF-3F3" id="EHS-uA-baK"/>
<outlet property="summaryHeaderLabel" destination="27" id="f5M-Ao-eBL"/>
<outlet property="summaryLabel" destination="T4E-dH-b3j" id="qVC-t4-llZ"/>
<outlet property="webView" destination="rUU-Fj-t5t" id="N50-LI-vy0"/>
@@ -365,6 +393,24 @@ If you are a user of an openBIS server, plese enter the URL and your login detai
</objects>
<point key="canvasLocation" x="859" y="-631"/>
</scene>
+ <!--Image View Popover Controller - Image-->
+ <scene sceneID="7Y2-7U-x48">
+ <objects>
+ <viewController title="Image" id="Jth-PN-dE1" customClass="CISDOBImageViewPopoverController" sceneMemberID="viewController">
+ <webView key="view" contentMode="scaleToFill" id="vBh-MQ-5Tm">
+ <rect key="frame" x="0.0" y="20" width="748" height="1044"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+ <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
+ <simulatedOrientationMetrics key="simulatedOrientationMetrics" orientation="landscapeRight"/>
+ </webView>
+ <connections>
+ <outlet property="webView" destination="vBh-MQ-5Tm" id="8LE-n7-KZf"/>
+ </connections>
+ </viewController>
+ <placeholder placeholderIdentifier="IBFirstResponder" id="NUF-R7-bDU" userLabel="First Responder" sceneMemberID="firstResponder"/>
+ </objects>
+ <point key="canvasLocation" x="1516" y="-1092"/>
+ </scene>
<!--Navigation Controller-->
<scene sceneID="50">
<objects>
@@ -393,6 +439,12 @@ If you are a user of an openBIS server, plese enter the URL and your login detai
<relationship kind="outlet" name="webView" candidateClass="UIWebView"/>
</relationships>
</class>
+ <class className="CISDOBImageViewPopoverController" superclassName="UIViewController">
+ <source key="sourceIdentifier" type="project" relativePath="./Classes/CISDOBImageViewPopoverController.h"/>
+ <relationships>
+ <relationship kind="outlet" name="webView" candidateClass="UIWebView"/>
+ </relationships>
+ </class>
<class className="CISDOBLoginViewController" superclassName="UIViewController">
<source key="sourceIdentifier" type="project" relativePath="./Classes/CISDOBLoginViewController.h"/>
<relationships>