From 64819001156df825828f0a473ceed09b7066a80f Mon Sep 17 00:00:00 2001
From: kenstir <kenstir@gmail.com>
Date: Thu, 22 Oct 2015 21:47:36 -0400
Subject: [PATCH] Fixed hold details and place hold views to be left-justified
 instead of center-justified in column 1.  Used table layout instead of linear
 layout.

---
 .../src/Android/core/res/layout/hold_details.xml   | 371 +++++++--------
 .../Android/core/res/layout/holds_list_item.xml    |   2 +-
 .../src/Android/core/res/layout/place_hold.xml     | 515 ++++++++++-----------
 3 files changed, 400 insertions(+), 488 deletions(-)

diff --git a/Open-ILS/src/Android/core/res/layout/hold_details.xml b/Open-ILS/src/Android/core/res/layout/hold_details.xml
index 0dbd086cd4..ad1409b6ed 100644
--- a/Open-ILS/src/Android/core/res/layout/hold_details.xml
+++ b/Open-ILS/src/Android/core/res/layout/hold_details.xml
@@ -1,222 +1,171 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@drawable/background_grey_image"
-     >
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:layout_width="fill_parent"
+              android:layout_height="fill_parent"
+              android:orientation="vertical"
+              android:background="@drawable/background_grey_image"
+              android:focusable="true"
+              android:focusableInTouchMode="true"
+        >
 
     <ScrollView
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:fillViewport="true"
-        android:layout_above="@id/action_bar"
-        android:padding="5dp"
-        android:layout_alignParentTop="true">
-       <LinearLayout 
-           android:layout_width="fill_parent"
-           android:layout_height="wrap_content"
-           android:orientation="vertical"
-           >
-            <LinearLayout 
-	        android:layout_width="fill_parent"
-	        android:layout_height="wrap_content"
-	        android:orientation="horizontal"
-	        >
-		        <TextView 
-		            android:layout_width="0dip"
-		            android:layout_height="wrap_content"
-		            android:layout_weight="2"
-		            android:text="@string/recipient"
-		            />
-		        
-		        <TextView 
-		            android:id="@+id/hold_recipient"
-		            android:layout_width="0dip"
-		            android:layout_height="wrap_content"
-		            android:layout_weight="4"
-		            android:gravity="center"
-		            />    
-	    </LinearLayout>
-	    	        <LinearLayout 
-	        android:layout_width="fill_parent"
-	        android:layout_height="wrap_content"
-	        android:orientation="horizontal"
-	        >
-		        <TextView 
-		            android:layout_width="0dip"
-		            android:layout_height="wrap_content"
-		            android:layout_weight="2"
-		            android:text="@string/title"
-		            />
-		        
-		        <TextView 
-		            android:id="@+id/hold_title"
-		            android:layout_width="0dip"
-		            android:layout_height="wrap_content"
-		            android:layout_weight="4"
-		            android:gravity="center"
-		            />    
-	    </LinearLayout>
-	    	        <LinearLayout 
-	        android:layout_width="fill_parent"
-	        android:layout_height="wrap_content"
-	        android:orientation="horizontal"
-	        >
-		        <TextView 
-		            android:layout_width="0dip"
-		            android:layout_height="wrap_content"
-		            android:layout_weight="2"
-		            android:text="@string/author"
-		            />
-
-		        <TextView
-		            android:id="@+id/hold_author"
-		            android:layout_width="0dip"
-		            android:layout_height="wrap_content"
-		            android:layout_weight="4"
-		            android:gravity="center"
-		            />    
-	    </LinearLayout>
-	    	        <LinearLayout
-	        android:layout_width="fill_parent"
-	        android:layout_height="wrap_content"
-	        android:orientation="horizontal"
-	        >
-		        <TextView
-		            android:layout_width="0dip"
-		            android:layout_height="wrap_content"
-		            android:layout_weight="2"
-		            android:text="@string/physical_description"
-		            />
-
-		        <TextView
-		            android:id="@+id/hold_physical_description"
-		            android:layout_width="0dip"
-		            android:layout_height="wrap_content"
-		            android:layout_weight="4"
-		            android:gravity="center"
-		            />
-	    </LinearLayout>
-	    	        <LinearLayout
-	        android:layout_width="fill_parent"
-	        android:layout_height="wrap_content"
-	        android:orientation="horizontal"
-	        >    
-	    </LinearLayout>
-	    	        <LinearLayout 
-	        android:layout_width="fill_parent"
-	        android:layout_height="wrap_content"
-	        android:orientation="horizontal"
-	        >    
-	    </LinearLayout>
-	    	        <LinearLayout 
-	        android:layout_width="fill_parent"
-	        android:layout_height="wrap_content"
-	        android:orientation="horizontal"
-	        >    
-	    </LinearLayout>
-	    	        <LinearLayout 
-	        android:layout_width="fill_parent"
-	        android:layout_height="wrap_content"
-	        android:orientation="horizontal"
-	        >
-		        <TextView 
-		            android:layout_width="0dip"
-		            android:layout_height="wrap_content"
-		            android:layout_weight="2"
-		            android:text="@string/pickup_location"
-		            />
-		        
-		        <Spinner
-		            android:id="@+id/hold_pickup_location"
-		            android:layout_width="0dip"
-		            android:layout_height="wrap_content"
-		            android:layout_weight="4"
-		            android:gravity="center"
-                    android:spinnerMode="dialog"
-		            />    
-	    </LinearLayout>
-	    	        <LinearLayout 
-	        android:layout_width="fill_parent"
-	        android:layout_height="wrap_content"
-	        android:orientation="horizontal"
-	        >
-		        <TextView 
-		            android:layout_width="0dip"
-		            android:layout_height="wrap_content"
-		            android:layout_weight="2"
-		            android:text="@string/expiration_date"
-		            />
-		        
-		        <EditText 
-		            android:id="@+id/hold_expiration_date"
-		            android:layout_width="0dip"
-		            android:layout_height="wrap_content"
-		            android:layout_weight="4"
-		            android:gravity="center"
-		            android:hint="@string/hold_expire_time_hint"
-		            />
-		        
-		        
-	    </LinearLayout>
-	    
-	    	     <LinearLayout 
-	        android:layout_width="fill_parent"
-	        android:layout_height="wrap_content"
-	        android:orientation="horizontal"
-	        >
-		        <TextView 
-		            android:layout_width="0dip"
-		            android:layout_height="wrap_content"
-		            android:layout_weight="2"
-		            android:text="@string/suspend_hold"
-		            />
-		        
-		        <CheckBox
-		            android:id="@+id/hold_suspend_hold"
-		            android:layout_width="0dip"
-		            android:layout_height="wrap_content"
-		            android:layout_weight="4"
-		            android:gravity="center"
-		            />    
-	    </LinearLayout>
-
- 	         <LinearLayout 
-	        android:layout_width="fill_parent"
-	        android:layout_height="wrap_content"
-	        android:orientation="horizontal"
-	        >
-		        <TextView 
-		            android:layout_width="0dip"
-		            android:layout_height="wrap_content"
-		            android:layout_weight="2"
-		            android:text="@string/thaw_date"
-		            />
-		        
-		        <EditText 
-		            android:id="@+id/hold_thaw_date"
-		            android:layout_width="0dip"
-		            android:layout_height="wrap_content"
-		            android:layout_weight="4"
-		            android:gravity="center"
-		            android:hint="@string/hold_thaw_date_hint"
-		            />
-		        
-		        
-	    </LinearLayout>
- 	     
-       </LinearLayout>
-    
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:fillViewport="true"
+            android:padding="5dp"
+            android:layout_alignParentTop="true">
+
+        <TableLayout
+                android:layout_width="fill_parent"
+                android:layout_height="fill_parent"
+                >
+
+            <TableRow>
+                <TextView
+                        android:layout_width="0dip"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="2"
+                        android:text="@string/recipient"
+                        />
+
+                <TextView
+                        android:id="@+id/hold_recipient"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="4"
+                        android:gravity="left"
+                        android:text="yomomma"
+                        android:layout_gravity="left"/>
+            </TableRow>
+            <TableRow>
+                <TextView
+                        android:layout_width="0dip"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="2"
+                        android:text="@string/title"
+                        />
+
+                <TextView
+                        android:id="@+id/hold_title"
+                        android:layout_width="0dip"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="4"
+                        android:gravity="left"
+                        android:text="Trashed : a graphic novel" android:layout_gravity="left"/>
+            </TableRow>
+            <TableRow>
+                <TextView
+                        android:layout_width="0dip"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="2"
+                        android:text="@string/author"
+                        />
+
+                <TextView
+                        android:id="@+id/hold_author"
+                        android:layout_width="0dip"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="4"
+                        android:gravity="left"
+                        android:text="Derf" android:layout_gravity="left"/>
+            </TableRow>
+            <TableRow>
+                <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="2"
+                        android:text="@string/physical_description"
+                        />
+
+                <TextView
+                        android:id="@+id/hold_physical_description"
+                        android:layout_width="0dip"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="4"
+                        android:gravity="left"
+                        android:text="print 256 p. blah blah blah blah"
+                        android:layout_gravity="left"/>
+            </TableRow>
+            <TableRow>
+                <TextView
+                        android:layout_width="0dip"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="2"
+                        android:text="@string/pickup_location"
+                        />
+
+                <Spinner
+                        android:id="@+id/hold_pickup_location"
+                        android:layout_width="0dip"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="4"
+                        android:gravity="left"
+                        android:spinnerMode="dialog"
+                        android:layout_gravity="left"/>
+            </TableRow>
+            <TableRow>
+                <TextView
+                        android:layout_width="0dip"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="2"
+                        android:text="@string/expiration_date"
+                        />
+
+                <EditText
+                        android:id="@+id/hold_expiration_date"
+                        android:layout_width="0dip"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="4"
+                        android:gravity="left"
+                        android:hint="@string/hold_expire_time_hint"
+                        android:layout_gravity="left"/>
+            </TableRow>
+
+            <TableRow>
+                <TextView
+                        android:layout_width="0dip"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="2"
+                        android:text="@string/suspend_hold"
+                        />
+
+                <CheckBox
+                        android:id="@+id/hold_suspend_hold"
+                        android:layout_width="0dip"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="4"
+                        android:gravity="left"
+                        android:layout_gravity="left"/>
+            </TableRow>
+            <TableRow>
+                <TextView
+                        android:layout_width="0dip"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="2"
+                        android:text="@string/thaw_date"
+                        />
+
+                <EditText
+                        android:id="@+id/hold_thaw_date"
+                        android:layout_width="0dip"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="4"
+                        android:gravity="left"
+                        android:hint="@string/hold_thaw_date_hint"
+                        android:layout_gravity="left"/>
+
+
+            </TableRow>
+
+        </TableLayout>
     </ScrollView>
 
     <LinearLayout
             android:id="@+id/action_bar"
-            android:layout_width="wrap_content"
+            android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:orientation="horizontal"
             android:gravity="center_horizontal"
-            android:layout_alignParentBottom="true"
-            android:layout_centerInParent="true"
             android:paddingBottom="3dip"
             >
         <Button
@@ -247,6 +196,4 @@
                 />
     </LinearLayout>
 
-
-
-</RelativeLayout>
\ No newline at end of file
+</LinearLayout>
\ No newline at end of file
diff --git a/Open-ILS/src/Android/core/res/layout/holds_list_item.xml b/Open-ILS/src/Android/core/res/layout/holds_list_item.xml
index d877d51769..beeea6e665 100644
--- a/Open-ILS/src/Android/core/res/layout/holds_list_item.xml
+++ b/Open-ILS/src/Android/core/res/layout/holds_list_item.xml
@@ -33,6 +33,6 @@
             android:layout_height="wrap_content"
             android:id="@+id/hold_status"
             android:textColor="@color/blue"
-            android:text="Waiting on copy"/>
+            android:text="Waiting for copy\n1 hold on 0 copies\nQueue position: 1"/>
 
 </LinearLayout>
diff --git a/Open-ILS/src/Android/core/res/layout/place_hold.xml b/Open-ILS/src/Android/core/res/layout/place_hold.xml
index 22360a358c..466be7cd7b 100644
--- a/Open-ILS/src/Android/core/res/layout/place_hold.xml
+++ b/Open-ILS/src/Android/core/res/layout/place_hold.xml
@@ -1,280 +1,245 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@drawable/background_grey_image"
-     >
-
-    	<LinearLayout
-    	    android:id="@+id/action_bar"
-	        android:layout_width="wrap_content" 
-	        android:layout_height="wrap_content"
-	        android:orientation="horizontal"
-	        android:gravity="center_horizontal"
-	        android:layout_alignParentBottom="true"
-	        android:layout_centerInParent="true"
-	        android:layout_marginBottom="3dip"
-	     	>
-	        <Button
-	            android:id="@+id/cancel_hold"
-	            android:layout_width="120dip"
-	            android:layout_height="wrap_content"
-	            android:text="@string/cancel"
-	            style="@style/ApplicationButton"
-	            android:layout_margin="5dip"
-	            />
-	        
-	        <Button 
-	            android:id="@+id/place_hold"
-	            android:layout_width="120dip"
-	            android:layout_height="wrap_content"
-	            android:text="@string/button_place_hold"
-	            style="@style/ApplicationButton"
-	            android:layout_margin="5dip"
-	            />	 
-	    </LinearLayout>
-    
-    <ScrollView 
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:fillViewport="true"
-        android:layout_above="@id/action_bar"
-        android:padding="5dip"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:layout_width="fill_parent"
+              android:layout_height="fill_parent"
+              android:orientation="vertical"
+              android:background="@drawable/background_grey_image"
+              android:focusable="true"
+              android:focusableInTouchMode="true"
         >
-       <LinearLayout 
-           android:layout_width="fill_parent"
-           android:layout_height="wrap_content"
-           android:orientation="vertical"
-           >
-            <LinearLayout 
-	        android:layout_width="fill_parent"
-	        android:layout_height="wrap_content"
-	        android:orientation="horizontal"
-	        >
-		        <TextView 
-		            android:layout_width="0dip"
-		            android:layout_height="wrap_content"
-		            android:layout_weight="2"
-		            android:text="@string/recipient"
-		            />
-		        
-		        <TextView 
-		            android:id="@+id/hold_recipient"
-		            android:layout_width="0dip"
-		            android:layout_height="wrap_content"
-		            android:layout_weight="4"
-		            android:gravity="center"
-		            />    
-	    </LinearLayout>
-	    	        <LinearLayout 
-	        android:layout_width="fill_parent"
-	        android:layout_height="wrap_content"
-	        android:orientation="horizontal"
-	        >
-		        <TextView 
-		            android:layout_width="0dip"
-		            android:layout_height="wrap_content"
-		            android:layout_weight="2"
-		            android:text="@string/title"
-		            />
-		        
-		        <TextView 
-		            android:id="@+id/hold_title"
-		            android:layout_width="0dip"
-		            android:layout_height="wrap_content"
-		            android:layout_weight="4"
-		            android:gravity="center"
-		            />    
-	    </LinearLayout>
-	    	        <LinearLayout 
-	        android:layout_width="fill_parent"
-	        android:layout_height="wrap_content"
-	        android:orientation="horizontal"
-	        >
-		        <TextView 
-		            android:layout_width="0dip"
-		            android:layout_height="wrap_content"
-		            android:layout_weight="2"
-		            android:text="@string/author"
-		            />
-		        
-		        <TextView 
-		            android:id="@+id/hold_author"
-		            android:layout_width="0dip"
-		            android:layout_height="wrap_content"
-		            android:layout_weight="4"
-		            android:gravity="center"
-		            />    
-	    </LinearLayout>
-	    	        <LinearLayout 
-	        android:layout_width="fill_parent"
-	        android:layout_height="wrap_content"
-	        android:orientation="horizontal"
-	        >
-		        <TextView 
-		            android:layout_width="0dip"
-		            android:layout_height="wrap_content"
-		            android:layout_weight="2"
-		            android:text="@string/physical_description"
-		            />
-		        
-		        <TextView 
-		            android:id="@+id/hold_physical_description"
-		            android:layout_width="0dip"
-		            android:layout_height="wrap_content"
-		            android:layout_weight="4"
-		            android:gravity="center"
-		            />    
-	    </LinearLayout>
-	    	        <LinearLayout 
-	        android:layout_width="fill_parent"
-	        android:layout_height="wrap_content"
-	        android:orientation="horizontal"
-	        >
-		        <TextView 
-		            android:layout_width="0dip"
-		            android:layout_height="wrap_content"
-		            android:layout_weight="2"
-		            android:text="@string/contact_telephone"
-		            />
-		        
-		        <EditText
-		            android:id="@+id/hold_contact_telephone"
-		            android:layout_width="0dip"
-		            android:layout_height="wrap_content"
-		            android:layout_weight="4"
-		            android:gravity="center"
-		            />    
-	    </LinearLayout>
-	    	        <LinearLayout 
-	        android:layout_width="fill_parent"
-	        android:layout_height="wrap_content"
-	        android:orientation="horizontal"
-	        >
-		        <TextView 
-		            android:layout_width="0dip"
-		            android:layout_height="wrap_content"
-		            android:layout_weight="2"
-		            android:text="@string/enable_phone_notification"
-		            />
-		        
-		        <CheckBox
-		            android:id="@+id/hold_enable_phone_notification"
-		            android:layout_width="0dip"
-		            android:layout_height="wrap_content"
-		            android:layout_weight="4"
-		            android:gravity="center"
-		            />    
-	    </LinearLayout>
-	    	        <LinearLayout 
-	        android:layout_width="fill_parent"
-	        android:layout_height="wrap_content"
-	        android:orientation="horizontal"
-	        >
-		        <TextView 
-		            android:layout_width="0dip"
-		            android:layout_height="wrap_content"
-		            android:layout_weight="2"
-		            android:text="@string/enable_email_notification"
-		            />
-		        
-		        <CheckBox
-		            android:id="@+id/hold_enable_email_notification"
-		            android:layout_width="0dip"
-		            android:layout_height="wrap_content"
-		            android:layout_weight="4"
-		            android:gravity="center"
-		            />    
-	    </LinearLayout>
-	    	        <LinearLayout 
-	        android:layout_width="fill_parent"
-	        android:layout_height="wrap_content"
-	        android:orientation="horizontal"
-	        >
-		        <TextView 
-		            android:layout_width="0dip"
-		            android:layout_height="wrap_content"
-		            android:layout_weight="2"
-		            android:text="@string/pickup_location"
-		            />
-		        
-		        <Spinner
-		            android:id="@+id/hold_pickup_location"
-		            android:layout_width="0dip"
-		            android:layout_height="wrap_content"
-		            android:layout_weight="4"
-		            android:gravity="center"
-                    android:spinnerMode="dialog"
-		            />    
-	    </LinearLayout>
-	    	        <LinearLayout 
-	        android:layout_width="fill_parent"
-	        android:layout_height="wrap_content"
-	        android:orientation="horizontal"
-	        >
-		        <TextView 
-		            android:layout_width="0dip"
-		            android:layout_height="wrap_content"
-		            android:layout_weight="2"
-		            android:text="@string/expiration_date"
-		            />
-		        
-		        <EditText 
-		            android:id="@+id/hold_expiration_date"
-		            android:layout_width="0dip"
-		            android:layout_height="wrap_content"
-		            android:layout_weight="4"
-		            android:gravity="center"
-		            />
-		        
-		        
-	    </LinearLayout>
-	    
-	    	     <LinearLayout 
-	        android:layout_width="fill_parent"
-	        android:layout_height="wrap_content"
-	        android:orientation="horizontal"
-	        >
-		        <TextView 
-		            android:layout_width="0dip"
-		            android:layout_height="wrap_content"
-		            android:layout_weight="2"
-		            android:text="@string/suspend_hold"
-		            />
-		        
-		        <CheckBox
-		            android:id="@+id/hold_suspend_hold"
-		            android:layout_width="0dip"
-		            android:layout_height="wrap_content"
-		            android:layout_weight="4"
-		            android:gravity="center"
-		            />    
-	    </LinearLayout>
- 	         <LinearLayout 
-	        android:layout_width="fill_parent"
-	        android:layout_height="wrap_content"
-	        android:orientation="horizontal"
-	        >
-		        <TextView 
-		            android:layout_width="0dip"
-		            android:layout_height="wrap_content"
-		            android:layout_weight="2"
-		            android:text="@string/thaw_date"
-		            />
-		        
-		        <EditText 
-		            android:id="@+id/hold_thaw_date"
-		            android:layout_width="0dip"
-		            android:layout_height="wrap_content"
-		            android:layout_weight="4"
-		            android:gravity="center"
-		            />
-		        
-		        
-	    </LinearLayout>
-       </LinearLayout>
-    
+
+    <ScrollView
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:fillViewport="true"
+            android:padding="5dip"
+            android:layout_alignParentTop="true">
+
+        <TableLayout
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                >
+
+            <TableRow>
+                <TextView
+                        android:layout_width="0dip"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="2"
+                        android:text="@string/recipient"
+                        />
+
+                <TextView
+                        android:id="@+id/hold_recipient"
+                        android:layout_width="0dip"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="4"
+                        android:gravity="left"
+                        android:layout_gravity="left"
+                        android:text="yomomma"/>
+            </TableRow>
+            <TableRow>
+                <TextView
+                        android:layout_width="0dip"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="2"
+                        android:text="@string/title"
+                        />
+
+                <TextView
+                        android:id="@+id/hold_title"
+                        android:layout_width="0dip"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="4"
+                        android:gravity="center"
+                        />
+            </TableRow>
+            <TableRow>
+                <TextView
+                        android:layout_width="0dip"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="2"
+                        android:text="@string/author"
+                        />
+
+                <TextView
+                        android:id="@+id/hold_author"
+                        android:layout_width="0dip"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="4"
+                        android:gravity="center"
+                        />
+            </TableRow>
+            <TableRow>
+                <TextView
+                        android:layout_width="0dip"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="2"
+                        android:text="@string/physical_description"
+                        />
+
+                <TextView
+                        android:id="@+id/hold_physical_description"
+                        android:layout_width="0dip"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="4"
+                        android:gravity="center"
+                        />
+            </TableRow>
+            <TableRow
+                    >
+                <TextView
+                        android:layout_width="0dip"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="2"
+                        android:text="@string/contact_telephone"
+                        />
+
+                <EditText
+                        android:id="@+id/hold_contact_telephone"
+                        android:layout_width="0dip"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="4"
+                        android:gravity="center"
+                        />
+            </TableRow>
+            <TableRow
+                    >
+                <TextView
+                        android:layout_width="0dip"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="2"
+                        android:text="@string/enable_phone_notification"
+                        />
+
+                <CheckBox
+                        android:id="@+id/hold_enable_phone_notification"
+                        android:layout_width="0dip"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="4"
+                        android:gravity="center"
+                        />
+            </TableRow>
+            <TableRow
+                    >
+                <TextView
+                        android:layout_width="0dip"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="2"
+                        android:text="@string/enable_email_notification"
+                        />
+
+                <CheckBox
+                        android:id="@+id/hold_enable_email_notification"
+                        android:layout_width="0dip"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="4"
+                        android:gravity="center"
+                        />
+            </TableRow>
+            <TableRow
+                    >
+                <TextView
+                        android:layout_width="0dip"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="2"
+                        android:text="@string/pickup_location"
+                        />
+
+                <Spinner
+                        android:id="@+id/hold_pickup_location"
+                        android:layout_width="0dip"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="4"
+                        android:gravity="center"
+                        android:spinnerMode="dialog"
+                        />
+            </TableRow>
+            <TableRow
+                    >
+                <TextView
+                        android:layout_width="0dip"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="2"
+                        android:text="@string/expiration_date"
+                        />
+
+                <EditText
+                        android:id="@+id/hold_expiration_date"
+                        android:layout_width="0dip"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="4"
+                        android:gravity="center"
+                        />
+
+
+            </TableRow>
+
+            <TableRow
+                    >
+                <TextView
+                        android:layout_width="0dip"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="2"
+                        android:text="@string/suspend_hold"
+                        />
+
+                <CheckBox
+                        android:id="@+id/hold_suspend_hold"
+                        android:layout_width="0dip"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="4"
+                        android:gravity="center"
+                        />
+            </TableRow>
+            <TableRow
+                    >
+                <TextView
+                        android:layout_width="0dip"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="2"
+                        android:text="@string/thaw_date"
+                        />
+
+                <EditText
+                        android:id="@+id/hold_thaw_date"
+                        android:layout_width="0dip"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="4"
+                        android:gravity="center"
+                        />
+
+
+            </TableRow>
+        </TableLayout>
+
     </ScrollView>
 
+    <LinearLayout
+            android:id="@+id/action_bar"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:gravity="center_horizontal"
+            android:paddingBottom="3dip"
+            >
+        <Button
+                android:id="@+id/cancel_hold"
+                android:layout_width="120dip"
+                android:layout_height="wrap_content"
+                android:text="@string/cancel"
+                style="@style/ApplicationButton"
+                android:layout_margin="5dip"
+                />
+
+        <Button
+                android:id="@+id/place_hold"
+                android:layout_width="120dip"
+                android:layout_height="wrap_content"
+                android:text="@string/button_place_hold"
+                style="@style/ApplicationButton"
+                android:layout_margin="5dip"
+                />
+    </LinearLayout>
+
 
-</RelativeLayout>
\ No newline at end of file
+</LinearLayout>
\ No newline at end of file
-- 
2.11.0