942. Araxis Merge File Comparison Report

Produced by Araxis Merge on 2/1/2017 2:57:36 PM Eastern Standard Time. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a modern standards-compliant browser. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.

942.1 Files compared

#	Location	File	Last Modified
1	C:\Araxis_Merge_Comprasion\Pub_un\BTSSS_CIF_122016.zip\BTSSS_CIF_12_20_16\clean\CRM\trunk\SDK\Tools\WebResourceUtility\Views	ConnectionsView.xaml	Tue Dec 20 19:52:28 2016 UTC
2			Wed Feb 1 19:57:36 2017 UTC

942.2 Comparison summary

Description	Between Files 1 and 2
Description	Text Blocks	Lines
Unchanged	0	0
Changed	0	0
Inserted	0	0
Removed	1	97

942.3 Comparison options

Whitespace
Character case	Differences in character case are significant
Line endings	Differences in line endings (`CR` and `LF` characters) are ignored
CR/LF characters	Not shown in the comparison detail

942.4 Active regular expressions

No regular expressions were active.

942.5 Comparison detail

1		<UserContr ol
2		x: Class="Mic rosoft.Crm .Sdk.Sampl es.Connect ionsView"
3		xm lns="http: //schemas. microsoft. com/winfx/ 2006/xaml/ presentati on"
4		xm lns:x="htt p://schema s.microsof t.com/winf x/2006/xam l"
5		xm lns:d="htt p://schema s.microsof t.com/expr ession/ble nd/2008"
6		xm lns:mc="ht tp://schem as.openxml formats.or g/markup-c ompatibili ty/2006"
7		mc :Ignorable ="d"
8		>
9		<B order Corn erRadius=" 8,8,8,8" B ackground= "LightGray " >
10		<G rid Margin ="10" >
11		<Grid.Ro wDefinitio ns>
12		<RowDe finition H eight="Aut o" />
13		<RowDefi nition Hei ght="Auto" />
14		<RowDefi nition Hei ght="Auto" />
15		<RowDefi nition Hei ght="Auto" />
16		<RowDefi nition Hei ght="Auto" />
17		</Grid .RowDefini tions>
18		<Grid. ColumnDefi nitions>
19		<ColumnD efinition Width="Aut o" />
20		<ColumnD efinition/ >
21
22		</Grid .ColumnDef initions>
23		<TextB lock Text= "Connect t o an exist ing Connec tion or cr eate a new one."
24		Grid.Col umnSpan="3 "
25		FontWeig ht="Bold"
26		FontSize ="18.667"
27		FontFami ly="/WebRe sourceUtil ity;compon ent/Fonts/ #Arial" >
28		</Text Block>
29
30		<TextBlock Grid.Row= "1"
31		Te xt="Connec tions"
32		Fo ntWeight=" Bold"
33		Ma rgin="0,10 ,0,0" />
34		<Lis tBox
35		Horizo ntalAlignm ent="Left"
36		MinHei ght="140"
37		Width= "220"
38		Grid.R ow="2"
39		x:Name ="Configur ationsList Box"
40		ItemsS ource="{Bi nding Conf igurations }"
41		Select edItem="{B inding Sel ectedConfi guration, Mode=TwoWa y}"
42		Height ="140">
43		<ListB ox.ItemTem plate>
44		<DataTem plate>
45		<StackPane l Orientat ion="Horiz ontal">
46		<T extBlock T ext="{Bind ing Attrib ute[name]. Value}" />
47		</StackPan el>
48		</DataTe mplate>
49		</List Box.ItemTe mplate>
50		</Li stBox>
51		<Gri d Grid.Row ="2"
52		Grid.C olumn="1"
53		Margin ="4"
54		DataCo ntext="{Bi nding Path =SelectedC onfigurati on}">
55		<Grid. ColumnDefi nitions>
56		<ColumnD efinition Width="Aut o" />
57		<ColumnD efinition />
58		</Grid .ColumnDef initions>
59		<Grid. RowDefinit ions>
60		<RowDefi nition />
61		<RowDefi nition />
62		<RowDefi nition />
63		<RowDefi nition />
64		<Row Definition />
65		</Grid.R owDefiniti ons>
66		<TextBlo ck Grid.Ro w="0" Marg in="4" Tex t="Name:" VerticalAl ignment="C enter" />
67		<TextBlo ck Grid.Ro w="1" Marg in="4" Tex t="Server: " Vertical Alignment= "Center" / >
68		<TextB lock Grid. Row="2" Ma rgin="4" T ext="Organ ization:" VerticalAl ignment="C enter" />
69		<TextB lock Grid. Row="3" Ma rgin="4" T ext="Usern ame:" Vert icalAlignm ent="Cente r"/>
70		<TextB lock Grid. Row="4" Ma rgin="4" T ext="Domai n:" Vertic alAlignmen t="Center" />
71
72		<TextBox Grid.Row= "0" Grid.C olumn="1" Margin="4"
73		Te xt="{Bindi ng Path=At tribute[na me].Value, Mode=TwoW ay}" />
74
75		<TextBox Grid.Row= "1" Grid.C olumn="1" Margin="4"
76		Text="{B inding Pat h=Attribut e[server]. Value, Mod e=TwoWay}" />
77
78		<TextB ox Grid.Ro w="2" Grid .Column="1 " Margin=" 4"
79		Text="{B inding Pat h=Attribut e[orgName] .Value, Mo de=TwoWay} " />
80
81		<TextB ox Grid.Ro w="3" Grid .Column="1 " Margin=" 4"
82		Text="{B inding Pat h=Attribut e[userName ].Value, M ode=TwoWay }" />
83
84		<TextB ox Grid.Ro w="4" Grid .Column="1 " Margin=" 4"
85		Text="{B inding Pat h=Attribut e[domain]. Value, Mod e=TwoWay}" />
86		</Gr id>
87
88		<Uni formGrid M argin="0,4 ,0,4" Grid .Row="3" G rid.Column Span="2" R ows="1" >
89		<But ton Conten t="Connect !" Margin= "2" Comman d="{Bindin g Path=Act ivateConne ctionComma nd}" />
90		<Button Content="N ew" Margin ="2" Comma nd="{Bindi ng Path=Cr eateNewCon nectionCom mand}" />
91		<Button Content="S ave Connec tions" Mar gin="2" Co mmand="{Bi nding Path =SaveConne ctionsComm and}" />
92		<Button Content="D elete Conn ection" Ma rgin="2" C ommand="{B inding Pat h=DeleteCo nnectionCo mmand}" />
93		</Un iformGrid>
94		</Gr id>
95		</ Border>
96
97		</UserCont rol>