Produced by Araxis Merge on 2/1/2017 2:57:54 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.
| # | 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\plugins\templates\templates | default.js | Tue Dec 20 19:50:44 2016 UTC |
| 2 | Wed Feb 1 19:57:54 2017 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 0 | 0 |
| Changed | 0 | 0 |
| Inserted | 0 | 0 |
| Removed | 1 | 7 |
| 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 |
No regular expressions were active.
| 1 | /* | |||||
| 2 | Copyright (c) 2003- 2015, CKSo urce - Fre derico Kna bben. All rights res erved. | |||||
| 3 | This soft ware is co vered by C KEditor Co mmercial L icense. Us age withou t proper l icense is prohibited . | |||||
| 4 | */ | |||||
| 5 | CKEDITOR.a ddTemplate s("default ",{imagesP ath:CKEDIT OR.getUrl( CKEDITOR.p lugins.get Path("temp lates")+"t emplates/i mages/"),t emplates:[ {title:"Im age and Ti tle",image :"template 1.gif",des cription:" One main i mage with a title an d text tha t surround the image .",html:'\ x3ch3\x3e\ x3cimg src \x3d" " al t\x3d"" st yle\x3d"ma rgin-right : 10px" he ight\x3d"1 00" width\ x3d"100" a lign\x3d"l eft" /\x3e Type the t itle here\ x3c/h3\x3e \x3cp\x3eT ype the te xt here\x3 c/p\x3e'}, {title:"St range Temp late",imag e:"templat e2.gif",de scription: "A templat e that def ines two c olums, eac h one with a title, and some t ext.", | |||||
| 6 | html:'\x3c table cell spacing\x3 d"0" cellp adding\x3d "0" style\ x3d"width: 100%" bord er\x3d"0"\ x3e\x3ctr\ x3e\x3ctd style\x3d" width:50%" \x3e\x3ch3 \x3eTitle 1\x3c/h3\x 3e\x3c/td\ x3e\x3ctd\ x3e\x3c/td \x3e\x3ctd style\x3d "width:50% "\x3e\x3ch 3\x3eTitle 2\x3c/h3\ x3e\x3c/td \x3e\x3c/t r\x3e\x3ct r\x3e\x3ct d\x3eText 1\x3c/td\x 3e\x3ctd\x 3e\x3c/td\ x3e\x3ctd\ x3eText 2\ x3c/td\x3e \x3c/tr\x3 e\x3c/tabl e\x3e\x3cp \x3eMore t ext goes h ere.\x3c/p \x3e'},{ti tle:"Text and Table" ,image:"te mplate3.gi f",descrip tion:"A ti tle with s ome text a nd a table .", | |||||
| 7 | html:'\x3c div style\ x3d"width: 80%"\x3e\ x3ch3\x3eT itle goes here\x3c/h 3\x3e\x3ct able style \x3d"width :150px;flo at: right" cellspaci ng\x3d"0" cellpaddin g\x3d"0" b order\x3d" 1"\x3e\x3c caption st yle\x3d"bo rder:solid 1px black "\x3e\x3cs trong\x3eT able title \x3c/stron g\x3e\x3c/ caption\x3 e\x3ctr\x3 e\x3ctd\x3 e\x26nbsp; \x3c/td\x3 e\x3ctd\x3 e\x26nbsp; \x3c/td\x3 e\x3ctd\x3 e\x26nbsp; \x3c/td\x3 e\x3c/tr\x 3e\x3ctr\x 3e\x3ctd\x 3e\x26nbsp ;\x3c/td\x 3e\x3ctd\x 3e\x26nbsp ;\x3c/td\x 3e\x3ctd\x 3e\x26nbsp ;\x3c/td\x 3e\x3c/tr\ x3e\x3ctr\ x3e\x3ctd\ x3e\x26nbs p;\x3c/td\ x3e\x3ctd\ x3e\x26nbs p;\x3c/td\ x3e\x3ctd\ x3e\x26nbs p;\x3c/td\ x3e\x3c/tr \x3e\x3c/t able\x3e\x 3cp\x3eTyp e the text here\x3c/ p\x3e\x3c/ div\x3e'}] }); |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.