Skip to content

Commit b29368a

Browse files
asmith-atlasasmith-atlas
committed
Layout and other fixes for AS addon
1 parent d32fa85 commit b29368a

4 files changed

Lines changed: 371 additions & 24 deletions

File tree

‎Aeon-ArchivesSpace-Addon/Aeon-ArchivesSpace.lua‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -119,8 +119,10 @@ function Init()
119119
catalogSearchForm.Form = interfaceMngr:CreateForm("ArchivesSpace", "Script");
120120

121121
-- Add a browser
122+
local layoutName = "layout.xml";
122123
if (WebView2Enabled()) then
123-
catalogSearchForm.Browser = catalogSearchForm.Form:CreateBrowser("Catalog", "Catalog Browser", "Catalog Search", "WebView2");
124+
catalogSearchForm.Browser = catalogSearchForm.Form:CreateBrowser("WebView2Catalog", "Catalog Browser", "Catalog Search", "WebView2");
125+
layoutName = "layoutWebview.xml";
124126
else
125127
catalogSearchForm.Browser = catalogSearchForm.Form:CreateBrowser("Catalog", "Catalog Browser", "Catalog Search", "Chromium");
126128
end
@@ -149,7 +151,7 @@ function Init()
149151

150152
-- After we add all of our buttons and form elements, we can show the form.
151153
catalogSearchForm.Form:Show();
152-
catalogSearchForm.Form:LoadLayout("layout.xml");
154+
catalogSearchForm.Form:LoadLayout(layoutName);
153155

154156
transactionNumber = GetFieldValue("Transaction", "TransactionNumber");
155157

@@ -791,7 +793,7 @@ function CheckIfUserSignedIn()
791793

792794
if (jsResult.Success) then
793795
LogDebug("IsUserSignedIn() result: " .. tostring(jsResult.Result));
794-
return jsResult.Result == "True";
796+
return jsResult.Result == "True" or jsResult.Result == true;
795797
else
796798
LogDebug("Error determining if user is signed in: " .. jsResult.Message);
797799
return false;
@@ -829,7 +831,7 @@ function LoginPageLoaded()
829831

830832
if (jsResult.Success) then
831833
LogDebug("LoginPageLoaded() result: " .. tostring(jsResult.Result));
832-
return jsResult.Result == "True";
834+
return jsResult.Result == "True" or jsResult.Result == true;
833835
else
834836
LogDebug("Error determining if login page was loaded: " .. jsResult.Message);
835837
return false;

‎Aeon-ArchivesSpace-Addon/Config.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
33
<Name>ArchivesSpace Interface</Name>
44
<Author>Atlas Systems, Inc.</Author>
5-
<Version>2.2.0</Version>
5+
<Version>3.0.0</Version>
66
<Active>True</Active>
77
<Type>Addon</Type>
88
<Description>This addon performs searches in ArchivesSpace using the staff interface. This addon supports ArchivesSpace versions v2.8.0 and later.</Description>

‎Aeon-ArchivesSpace-Addon/layout.xml‎

Lines changed: 162 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<property name="TextAlignMode">UseParentOptions</property>
3030
</property>
3131
<property name="CaptionImageVisible">true</property>
32-
<property name="FlowDirection">LeftToRight</property>
32+
<property name="CellSize">@1,Width=0@1,Height=0</property>
3333
<property name="LayoutMode">Regular</property>
3434
<property name="CaptionImageLocation">Default</property>
3535
<property name="CaptionImageIndex">-1</property>
@@ -40,16 +40,103 @@
4040
<property name="ShowTabPageCloseButton">false</property>
4141
<property name="AllowHtmlStringInCaption">false</property>
4242
<property name="AllowGlyphSkinning">Default</property>
43+
<property name="OptionsPrint" isnull="true" iskey="true">
44+
<property name="AppearanceGroupCaption" isnull="true" iskey="true">
45+
<property name="ForeColor" />
46+
<property name="BorderColor" />
47+
<property name="BackColor" />
48+
<property name="BackColor2" />
49+
<property name="Font">Tahoma, 8.25pt</property>
50+
<property name="GradientMode">Horizontal</property>
51+
<property name="FontSizeDelta">0</property>
52+
<property name="FontStyleDelta">Regular</property>
53+
</property>
54+
<property name="AllowPrintGroupCaption">true</property>
55+
<property name="TextToControlDistance">-1</property>
56+
<property name="AllowPrint">true</property>
57+
<property name="AppearanceItemCaption" isnull="true" iskey="true">
58+
<property name="ForeColor" />
59+
<property name="BorderColor" />
60+
<property name="BackColor" />
61+
<property name="BackColor2" />
62+
<property name="Font">Tahoma, 8.25pt</property>
63+
<property name="GradientMode">Horizontal</property>
64+
<property name="FontSizeDelta">0</property>
65+
<property name="FontStyleDelta">Regular</property>
66+
</property>
67+
</property>
4368
<property name="OptionsTableLayoutGroup" isnull="true" iskey="true">
4469
<property name="RowDefinitions" iskey="true" value="0" />
4570
<property name="ColumnDefinitions" iskey="true" value="0" />
4671
</property>
47-
<property name="Size">@3,Width=988@3,Height=522</property>
72+
<property name="Size">@3,Width=977@3,Height=520</property>
4873
<property name="ExpandButtonVisible">false</property>
4974
<property name="ExpandButtonMode">Normal</property>
5075
<property name="HeaderButtonsLocation">Default</property>
51-
<property name="GroupStyle">Inherited</property>
76+
<property name="TextToControlDistance">0</property>
5277
<property name="TextLocation">Top</property>
78+
<property name="AppearanceTabPage" isnull="true" iskey="true">
79+
<property name="Header" isnull="true" iskey="true">
80+
<property name="ForeColor" />
81+
<property name="BorderColor" />
82+
<property name="BackColor" />
83+
<property name="BackColor2" />
84+
<property name="Font">Tahoma, 8.25pt</property>
85+
<property name="GradientMode">Horizontal</property>
86+
<property name="FontSizeDelta">0</property>
87+
<property name="FontStyleDelta">Regular</property>
88+
</property>
89+
<property name="HeaderActive" isnull="true" iskey="true">
90+
<property name="ForeColor" />
91+
<property name="BorderColor" />
92+
<property name="BackColor" />
93+
<property name="BackColor2" />
94+
<property name="Font">Tahoma, 8.25pt</property>
95+
<property name="GradientMode">Horizontal</property>
96+
<property name="FontSizeDelta">0</property>
97+
<property name="FontStyleDelta">Regular</property>
98+
</property>
99+
<property name="HeaderDisabled" isnull="true" iskey="true">
100+
<property name="ForeColor" />
101+
<property name="BorderColor" />
102+
<property name="BackColor" />
103+
<property name="BackColor2" />
104+
<property name="Font">Tahoma, 8.25pt</property>
105+
<property name="GradientMode">Horizontal</property>
106+
<property name="FontSizeDelta">0</property>
107+
<property name="FontStyleDelta">Regular</property>
108+
</property>
109+
<property name="HeaderHotTracked" isnull="true" iskey="true">
110+
<property name="ForeColor" />
111+
<property name="BorderColor" />
112+
<property name="BackColor" />
113+
<property name="BackColor2" />
114+
<property name="Font">Tahoma, 8.25pt</property>
115+
<property name="GradientMode">Horizontal</property>
116+
<property name="FontSizeDelta">0</property>
117+
<property name="FontStyleDelta">Regular</property>
118+
</property>
119+
<property name="PageClient" isnull="true" iskey="true">
120+
<property name="ForeColor" />
121+
<property name="BorderColor" />
122+
<property name="BackColor" />
123+
<property name="BackColor2" />
124+
<property name="Font">Tahoma, 8.25pt</property>
125+
<property name="GradientMode">Horizontal</property>
126+
<property name="FontSizeDelta">0</property>
127+
<property name="FontStyleDelta">Regular</property>
128+
</property>
129+
</property>
130+
<property name="AppearanceGroup" isnull="true" iskey="true">
131+
<property name="ForeColor" />
132+
<property name="BorderColor" />
133+
<property name="BackColor" />
134+
<property name="BackColor2" />
135+
<property name="Font">Tahoma, 8.25pt</property>
136+
<property name="GradientMode">Horizontal</property>
137+
<property name="FontSizeDelta">0</property>
138+
<property name="FontStyleDelta">Regular</property>
139+
</property>
53140
<property name="TabPageWidth">0</property>
54141
<property name="OptionsCustomization" isnull="true" iskey="true">
55142
<property name="AllowDrag">Default</property>
@@ -75,8 +162,20 @@
75162
<property name="IconAllowHtmlString">Default</property>
76163
</property>
77164
<property name="Name">Root</property>
165+
<property name="AppearanceItemCaption" isnull="true" iskey="true">
166+
<property name="ForeColor" />
167+
<property name="BorderColor" />
168+
<property name="BackColor" />
169+
<property name="BackColor2" />
170+
<property name="Font">Tahoma, 8.25pt</property>
171+
<property name="GradientMode">Horizontal</property>
172+
<property name="FontSizeDelta">0</property>
173+
<property name="FontStyleDelta">Regular</property>
174+
</property>
78175
<property name="ParentName" />
79176
<property name="TextVisible">false</property>
177+
<property name="Spacing">0, 0, 0, 0</property>
178+
<property name="Padding">0, 0, 0, 0</property>
80179
<property name="Location">@1,X=0@1,Y=0</property>
81180
<property name="ShowInCustomizationForm">true</property>
82181
<property name="Text">Main Group</property>
@@ -94,16 +193,25 @@
94193
<property name="ImageIndex">-1</property>
95194
<property name="ImageAlignment">MiddleLeft</property>
96195
<property name="ImageToTextDistance">5</property>
97-
<property name="SvgImage" isnull="true" />
98-
<property name="SvgImageSize">@1,Width=0@1,Height=0</property>
196+
<property name="OptionsPrint" isnull="true" iskey="true">
197+
<property name="TextToControlDistance">-1</property>
198+
<property name="AllowPrint">true</property>
199+
<property name="AppearanceItemCaption" isnull="true" iskey="true">
200+
<property name="ForeColor" />
201+
<property name="BorderColor" />
202+
<property name="BackColor" />
203+
<property name="BackColor2" />
204+
<property name="Font">Tahoma, 8.25pt</property>
205+
<property name="GradientMode">Horizontal</property>
206+
<property name="FontSizeDelta">0</property>
207+
<property name="FontStyleDelta">Regular</property>
208+
</property>
209+
</property>
99210
<property name="MaxSize">@1,Width=0@1,Height=0</property>
100-
<property name="MinSize">@3,Width=106@2,Height=22</property>
211+
<property name="MinSize">@3,Width=107@2,Height=24</property>
101212
<property name="ControlAlignment">TopLeft</property>
102213
<property name="ContentVisible">true</property>
103-
<property name="HighlightFocusedItem">Default</property>
104214
<property name="TrimClientAreaToControl">true</property>
105-
<property name="ContentVertAlignment">Default</property>
106-
<property name="ContentHorzAlignment">Default</property>
107215
<property name="AllowGlyphSkinning">Default</property>
108216
<property name="OptionsCustomization" isnull="true" iskey="true">
109217
<property name="AllowDrag">Default</property>
@@ -129,11 +237,24 @@
129237
<property name="IconAllowHtmlString">Default</property>
130238
</property>
131239
<property name="Name">CatalogItemsGrid</property>
240+
<property name="AppearanceItemCaption" isnull="true" iskey="true">
241+
<property name="ForeColor" />
242+
<property name="BorderColor" />
243+
<property name="BackColor" />
244+
<property name="BackColor2" />
245+
<property name="Font">Tahoma, 8.25pt</property>
246+
<property name="GradientMode">Horizontal</property>
247+
<property name="FontSizeDelta">0</property>
248+
<property name="FontStyleDelta">Regular</property>
249+
</property>
132250
<property name="ParentName">Root</property>
133251
<property name="TextVisible">false</property>
134252
<property name="TextSize">@1,Width=0@1,Height=0</property>
135-
<property name="Location">@1,X=0@3,Y=370</property>
136-
<property name="Size">@3,Width=974@3,Height=138</property>
253+
<property name="TextToControlDistance">3</property>
254+
<property name="Spacing">0, 0, 0, 0</property>
255+
<property name="Padding">2, 2, 2, 2</property>
256+
<property name="Location">@1,X=0@3,Y=435</property>
257+
<property name="Size">@3,Width=977@2,Height=85</property>
137258
<property name="ShowInCustomizationForm">true</property>
138259
<property name="Text">Items</property>
139260
<property name="CustomizationFormText">CatalogItemsGrid</property>
@@ -142,7 +263,7 @@
142263
<property name="TextLocation">Default</property>
143264
</property>
144265
<property name="Item3" isnull="true" iskey="true">
145-
<property name="TypeName">AtlasSystems.Scripting.UI.AddonControls.WebView2Browser</property>
266+
<property name="TypeName">AtlasSystems.Scripting.UI.AddonControls.ChromiumBrowser</property>
146267
<property name="ControlName">Catalog</property>
147268
<property name="AllowHtmlStringInCaption">false</property>
148269
<property name="TextAlignMode">CustomSize</property>
@@ -151,16 +272,25 @@
151272
<property name="ImageIndex">-1</property>
152273
<property name="ImageAlignment">MiddleLeft</property>
153274
<property name="ImageToTextDistance">5</property>
154-
<property name="SvgImage" isnull="true" />
155-
<property name="SvgImageSize">@1,Width=0@1,Height=0</property>
275+
<property name="OptionsPrint" isnull="true" iskey="true">
276+
<property name="TextToControlDistance">-1</property>
277+
<property name="AllowPrint">true</property>
278+
<property name="AppearanceItemCaption" isnull="true" iskey="true">
279+
<property name="ForeColor" />
280+
<property name="BorderColor" />
281+
<property name="BackColor" />
282+
<property name="BackColor2" />
283+
<property name="Font">Tahoma, 8.25pt</property>
284+
<property name="GradientMode">Horizontal</property>
285+
<property name="FontSizeDelta">0</property>
286+
<property name="FontStyleDelta">Regular</property>
287+
</property>
288+
</property>
156289
<property name="MaxSize">@1,Width=0@1,Height=0</property>
157-
<property name="MinSize">@3,Width=102@2,Height=22</property>
290+
<property name="MinSize">@3,Width=104@2,Height=24</property>
158291
<property name="ControlAlignment">TopLeft</property>
159292
<property name="ContentVisible">true</property>
160-
<property name="HighlightFocusedItem">Default</property>
161293
<property name="TrimClientAreaToControl">true</property>
162-
<property name="ContentVertAlignment">Default</property>
163-
<property name="ContentHorzAlignment">Default</property>
164294
<property name="AllowGlyphSkinning">Default</property>
165295
<property name="OptionsCustomization" isnull="true" iskey="true">
166296
<property name="AllowDrag">Default</property>
@@ -186,11 +316,24 @@
186316
<property name="IconAllowHtmlString">Default</property>
187317
</property>
188318
<property name="Name">Catalog</property>
319+
<property name="AppearanceItemCaption" isnull="true" iskey="true">
320+
<property name="ForeColor" />
321+
<property name="BorderColor" />
322+
<property name="BackColor" />
323+
<property name="BackColor2" />
324+
<property name="Font">Tahoma, 8.25pt</property>
325+
<property name="GradientMode">Horizontal</property>
326+
<property name="FontSizeDelta">0</property>
327+
<property name="FontStyleDelta">Regular</property>
328+
</property>
189329
<property name="ParentName">Root</property>
190330
<property name="TextVisible">false</property>
191331
<property name="TextSize">@1,Width=0@1,Height=0</property>
332+
<property name="TextToControlDistance">0</property>
333+
<property name="Spacing">0, 0, 0, 0</property>
334+
<property name="Padding">2, 2, 2, 2</property>
192335
<property name="Location">@1,X=0@1,Y=0</property>
193-
<property name="Size">@3,Width=974@3,Height=370</property>
336+
<property name="Size">@3,Width=977@3,Height=435</property>
194337
<property name="ShowInCustomizationForm">true</property>
195338
<property name="Text">Catalog Browser</property>
196339
<property name="CustomizationFormText">Catalog</property>

0 commit comments

Comments
 (0)