1574. Araxis Merge File Comparison Report

Produced by Araxis Merge on 2/1/2017 2:57:57 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.

1574.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 Portal\trunk\BTSSSPortal\js\ckeditor\samples index.html Tue Dec 20 19:50:50 2016 UTC
2 Wed Feb 1 19:57:57 2017 UTC

1574.2 Comparison summary

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

1574.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

1574.4 Active regular expressions

No regular expressions were active.

1574.5 Comparison detail

1   <!DOCTYPE  html>        
2   <!--        
3   Copyright  (c) 2003-2 015, CKSou rce - Fred erico Knab ben. All r ights rese rved.        
4   This softw are is cov ered by CK Editor Com mercial Li cense. Usa ge without  proper li cense is p rohibited.        
5   -->        
6   <html>        
7   <head>        
8           <m eta charse t="utf-8">        
9           <t itle>CKEdi tor Sample </title>        
10           <s cript src= "../ckedit or.js"></s cript>        
11           <s cript src= "js/sample .js"></scr ipt>        
12           <l ink rel="s tylesheet"  href="css /samples.c ss">        
13           <l ink rel="s tylesheet"  href="too lbarconfig urator/lib /codemirro r/neo.css" >        
14   </head>        
15   <body id=" main">        
16          
17   <nav class ="navigati on-a">        
18           <d iv class=" grid-conta iner">        
19                    <ul  class="nav igation-a- left grid- width-70">        
20                             <li><a  href="htt p://ckedit or.com">Pr oject Home page</a></ li>        
21                             <li><a  href="htt p://dev.ck editor.com /">I found  a bug</a> </li>        
22                             <li><a  href="htt p://github .com/ckedi tor/ckedit or-dev" cl ass="icon- pos-right  icon-navig ation-a-gi thub">Fork  CKEditor  on GitHub< /a></li>        
23                    </ul >        
24                    <ul  class="nav igation-a- right grid -width-30" >        
25                             <li><a  href="htt p://ckedit or.com/blo g-list">CK Editor Blo g</a></li>        
26                    </ul >        
27           </ div>        
28   </nav>        
29          
30   <header cl ass="heade r-a">        
31           <d iv class=" grid-conta iner">        
32                    <h1  class="hea der-a-logo  grid-widt h-30">        
33                             <a hre f="index.h tml"><img  src="img/l ogo.png" a lt="CKEdit or Sample" ></a>        
34                    </h1 >        
35          
36                    <nav  class="na vigation-b  grid-widt h-70">        
37                             <ul>        
38                                      <li><a h ref="index .html" cla ss="button -a button- a-backgrou nd">Start< /a></li>        
39                                      <li><a h ref="toolb arconfigur ator/index .html" cla ss="button -a">Toolba r configur ator <span  class="ba lloon-a ba lloon-a-nw ">Edit you r toolbar  now!</span ></a></li>        
40                             </ul>        
41                    </na v>        
42           </ div>        
43   </header>        
44          
45   <main>        
46           <d iv class=" adjoined-t op">        
47                    <div  class="gr id-contain er">        
48                             <div c lass="cont ent grid-w idth-100">        
49                                      <h1>Cong ratulation s!</h1>        
50                                      <p>        
51                                               If you can  see CKEdi tor below,  it means  that the i nstallatio n succeede d.        
52                                               You can no w try out  your new e ditor vers ion, see i ts feature s, and whe n you are  ready to m ove on, ch eck some o f the <a h ref="#samp le-customi ze">most u seful reso urces</a>  recommende d below.        
53                                      </p>        
54                             </div>        
55                    </di v>        
56           </ div>        
57           <d iv class=" adjoined-b ottom">        
58                    <div  class="gr id-contain er">        
59                             <div c lass="grid -width-100 ">        
60                                      <div id= "editor">        
61                                               <h1>Hello  world!</h1 >        
62                                               <p>I'm an  instance o f <a href= "http://ck editor.com ">CKEditor </a>.</p>        
63                                      </div>        
64                             </div>        
65                    </di v>        
66           </ div>        
67          
68           <d iv class=" grid-conta iner">        
69                    <div  class="co ntent grid -width-100 ">        
70                             <secti on id="sam ple-custom ize">        
71                                      <h2>Cust omize Your  Editor</h 2>        
72                                      <p>Modul ar build a nd <a href ="http://d ocs.ckedit or.com/#!/ guide/dev_ configurat ion">numer ous config uration op tions</a>  give you n early endl ess possib ilities to  customize  CKEditor.  Replace t he content  of your < code><a hr ef="../con fig.js">co nfig.js</a ></code> f ile with t he followi ng code an d refresh  this page  (<strong>r emember to  clear the  browser c ache</stro ng>)!</p>        
73                    <pre  class="cm -s-neo Cod eMirror">< code><span  style="pa dding-righ t: 0.1px;" ><span cla ss="cm-var iable">CKE DITOR</spa n>.<span c lass="cm-p roperty">e ditorConfi g</span> < span class ="cm-opera tor">=</sp an> <span  class="cm- keyword">f unction</s pan>( <spa n class="c m-def">con fig</span>  ) {</span >        
74   <span styl e="padding -right: 0. 1px;"><spa n class="c m-tab">        </span ><span cla ss="cm-var iable-2">c onfig</spa n>.<span c lass="cm-p roperty">l anguage</s pan> <span  class="cm -operator" >=</span>  <span clas s="cm-stri ng">'es'</ span>;</sp an>        
75   <span styl e="padding -right: 0. 1px;"><spa n class="c m-tab">        </span ><span cla ss="cm-var iable-2">c onfig</spa n>.<span c lass="cm-p roperty">u iColor</sp an> <span  class="cm- operator"> =</span> < span class ="cm-strin g">'#F7B42 C'</span>; </span>        
76   <span styl e="padding -right: 0. 1px;"><spa n class="c m-tab">        </span ><span cla ss="cm-var iable-2">c onfig</spa n>.<span c lass="cm-p roperty">h eight</spa n> <span c lass="cm-o perator">= </span> <s pan class= "cm-number ">300</spa n>;</span>        
77   <span styl e="padding -right: 0. 1px;"><spa n class="c m-tab">        </span ><span cla ss="cm-var iable-2">c onfig</spa n>.<span c lass="cm-p roperty">t oolbarCanC ollapse</s pan> <span  class="cm -operator" >=</span>  <span clas s="cm-atom ">true</sp an>;</span >        
78   <span styl e="padding -right: 0. 1px;">};</ span></cod e></pre>        
79                             </sect ion>        
80          
81                             <secti on>        
82                                      <h2>Tool bar Config uration</h 2>        
83                                      <p>If yo u want to  reorder to olbar butt ons or rem ove some o f them, ch eck <a hre f="toolbar configurat or/index.h tml">this  handy tool </a>!</p>        
84                             </sect ion>        
85          
86                             <secti on>        
87                                      <h2>More  Samples!< /h2>        
88                                      <p>Visit  the <a hr ef="http:/ /sdk.ckedi tor.com">C KEditor SD K</a> for  a huge col lection of  samples s howcasing  editor fea tures, wit h source c ode readil y availabl e to copy  and use in  your own  implementa tion.</p>        
89                             </sect ion>        
90          
91                             <secti on>        
92                                      <h2>Deve loper's Gu ide</h2>        
93                                      <p>The m ost import ant resour ce for all  developer s working  with CKEdi tor, integ rating it  with their  websites  and applic ations, an d customiz ing to the ir needs.  You can st art from h ere:</p>        
94                                      <ul>        
95                                               <li><a hre f="http:// docs.ckedi tor.com/#! /guide/dev _installat ion">Getti ng Started </a> &ndas h; Explain s most cru cial edito r concepts  and pract ices as we ll as the  installati on process  and integ ration wit h your web site.</li>        
96                                               <li><a hre f="http:// docs.ckedi tor.com/#! /guide/dev _advanced_ installati on">Advanc ed Install ation Conc epts</a> & ndash; Des cribes how  to upgrad e, install  additiona l componen ts (plugin s, skins),  or create  a custom  build.</li >        
97                                      </ul>        
98                                               <p>When yo u have the  basics so rted out,  feel free  to browse  some more  advanced s ections li ke:</p>        
99                                      <ul>        
100                                               <li><a hre f="http:// docs.ckedi tor.com/#! /guide/dev _features" >Functiona lity Overv iew</a> &n dash; Desc riptions a nd samples  of variou s editor f eatures.</ li>        
101                                               <li><a hre f="http:// docs.ckedi tor.com/#! /guide/plu gin_sdk_in tro">Plugi n SDK</a>,  <a href=" http://doc s.ckeditor .com/#!/gu ide/widget _sdk_intro ">Widget S DK</a>, an d <a href= "http://do cs.ckedito r.com/#!/g uide/skin_ sdk_intro" >Skin SDK< /a> &ndash ; Useful w hen you wa nt to crea te your ow n editor c omponents. </li>        
102                                      </ul>        
103                             </sect ion>        
104          
105                             <secti on>        
106                                      <h2>CKEd itor JavaS cript API< /h2>        
107                                      <p>CKEdi tor boasts  a rich <a  href="htt p://docs.c keditor.co m/#!/api"> JavaScript  API</a> t hat you ca n use to a djust the  editor to  your needs  and integ rate it wi th your we bsite or a pplication .</p>        
108                             </sect ion>        
109                    </di v>        
110           </ div>        
111   </main>        
112          
113   <footer cl ass="foote r-a grid-c ontainer">        
114           <d iv class=" grid-conta iner">        
115                    <p c lass="grid -width-100 ">        
116                             CKEdit or &ndash;  The text  editor for  the Inter net &ndash ; <a class ="samples"  href="htt p://ckedit or.com/">h ttp://cked itor.com</ a>        
117                    </p>        
118                    <p c lass="grid -width-100 " id="copy ">        
119                             Copyri ght &copy;  2003-2015 , <a class ="samples"  href="htt p://cksour ce.com/">C KSource</a > &ndash;  Frederico  Knabben. A ll rights  reserved.        
120                    </p>        
121           </ div>        
122   </footer>        
123   <script>        
124           in itSample() ;        
125   </script>        
126          
127   </body>        
128   </html>        

Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.