Commit ebb53789efb858df95b81831cc1b72e6383eec84
1 parent
409cac37
CB bug fixes of editor
Showing
2 changed files
with
9 additions
and
7 deletions
400-SOURCECODE/AIAHTML5.Web/app/views/CBuild/curriculum-builder-TinyMCEjspanel.html
| ... | ... | @@ -38,9 +38,9 @@ |
| 38 | 38 | </div> |
| 39 | 39 | </div> |
| 40 | 40 | <div class="col-sm-1 nopadding" id="cbEditorRightSideBar"> |
| 41 | - <div class="col-sm-12 nopadding" title="Hyperlink"> | |
| 42 | - <button class="btn btn-black btn-sm btn-block marginTop5" data-toggle="modal" data-target="#myModal-transparency-box"><img src="../../../content/images/CB/icon-link.png" alt="" title=""></button> | |
| 43 | - </div> | |
| 41 | + <!--<div class="col-sm-12 nopadding" title="Hyperlink"> | |
| 42 | + <button class="btn btn-black btn-sm btn-block marginTop5" data-toggle="modal" data-target="#myModal-transparency-box"><img src="../../../content/images/CB/icon-link.png" alt="" title=""></button> | |
| 43 | + </div>--> | |
| 44 | 44 | <div class="col-sm-6 nopadding" title="Add Slide"> |
| 45 | 45 | <button class="btn btn-black btn-sm marginTop5" onclick="CBAddNewSlide()"><img src="../../../content/images/CB/icon-addslide.png" alt="" title=""></button> |
| 46 | 46 | </div> |
| ... | ... | @@ -68,10 +68,10 @@ |
| 68 | 68 | }); |
| 69 | 69 | editor.setContent(''); |
| 70 | 70 | }, |
| 71 | - plugins: "lists, advlist , textcolor", | |
| 71 | + plugins: "lists, advlist , textcolor, autolink, link, anchor", | |
| 72 | 72 | menubar: false, |
| 73 | 73 | height : '520px', |
| 74 | - toolbar: 'fontsizeselect fontselect | bold italic underline | alignleft aligncenter alignright alignjustify | bullist numlist | forecolor backcolor', | |
| 74 | + toolbar: 'fontsizeselect fontselect | bold italic underline | alignleft aligncenter alignright alignjustify | bullist numlist | forecolor backcolor | link anchor', | |
| 75 | 75 | content_style: ".mce-content-body {font-size:14pt;font-family:Arial;}", |
| 76 | 76 | content_css: ['//fonts.googleapis.com/css?family=Indie+Flower'], |
| 77 | 77 | theme_advanced_fonts: "Andale Mono=andale mono,times;" + | ... | ... |
400-SOURCECODE/AIAHTML5.Web/content/data/json/cb/SlideShow/json/The_Nervous_System.json
| ... | ... | @@ -182,13 +182,15 @@ |
| 182 | 182 | "_isLocked": "false" |
| 183 | 183 | }, |
| 184 | 184 | { |
| 185 | - "structure": { | |
| 185 | + "structure": [ | |
| 186 | + { | |
| 186 | 187 | "_label": "Pterygopalatine Ganglion", |
| 187 | 188 | "_id": "0594A3CC-4397-22FA-E403-088226ED02AC", |
| 188 | 189 | "_isRoot": "false", |
| 189 | 190 | "_isBranch": "false", |
| 190 | 191 | "_isLocked": "false" |
| 191 | - }, | |
| 192 | + } | |
| 193 | + ], | |
| 192 | 194 | "_label": "Parasympathetic Division", |
| 193 | 195 | "_id": "597BF514-C12C-6DED-942A-0881B9E20C60", |
| 194 | 196 | "_isRoot": "false", | ... | ... |