Skip to content

Commit 4187162

Browse files
committed
Feature #9635: adjusting some stuffs
1 parent 52b21b3 commit 4187162

File tree

5 files changed

+11
-10
lines changed

5 files changed

+11
-10
lines changed

infoLetter/infoLetter-war/src/main/webapp/infoLetter/jsp/editLetter.jsp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@
9999

100100
<div class="field" id="contentArea">
101101
<div class="champs">
102-
<textarea rows="5" cols="10" name="editor" id="Content">${parutionContent}</textarea>
102+
<textarea rows="5" cols="10" name="editor" id="Content" style="display: none">${parutionContent}</textarea>
103103
</div>
104104
</div>
105105
</form>

infoLetter/infoLetter-war/src/main/webapp/wysiwyg/jsp/ckeditor/infoLetterConfig.js

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,10 @@ CKEDITOR.editorConfig = function( config )
1414
config.filebrowserImageBrowseUrl = config.baseHref+'uploadFile.jsp';
1515
config.filebrowserFlashBrowseUrl = config.baseHref+'uploadFile.jsp';
1616
config.filebrowserBrowseUrl = config.baseHref+'uploadFile.jsp';
17-
config.extraPlugins = 'userzoom,identitycard,allmedias';
17+
config.extraPlugins = 'userzoom,identitycard,allmedias,autolink,video,html5audio,imageresizerowandcolumn,variables,listblock,floatpanel,richcombo,mediaofcontribution,imagebank,filebank';
1818
config.allowedContent = true;
1919
config.toolbarCanCollapse = true;
20+
config.disableNativeSpellChecker = false;
2021
//config.forcePasteAsPlainText = true;
2122

2223
config.stylesSet = [
@@ -29,12 +30,12 @@ CKEDITOR.editorConfig = function( config )
2930
config.toolbar_infoLetter = [
3031
{ name: 'document', items : [ 'Source','-','NewPage','DocProps','Preview','Print','-','Templates' ] },
3132
{ name: 'clipboard', items : [ 'Cut','Copy','Paste','PasteText','PasteFromWord','-','Undo','Redo' ] },
32-
{ name: 'editing', items : [ 'Find','Replace','-','SelectAll','-','SpellChecker', 'Scayt' ] },
33+
{ name: 'editing', items : [ 'Find','Replace','-','SelectAll' ] },
3334
'/',
3435
{ name: 'basicstyles', items : [ 'Bold','Italic','Underline','Strike','Subscript','Superscript','-','RemoveFormat' ] },
35-
{ name: 'paragraph', items : [ 'NumberedList','BulletedList','-','Outdent','Indent','-','Blockquote','CreateDiv','-','JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock','-','BidiLtr','BidiRtl' ] },
36+
{ name: 'paragraph', items : [ 'NumberedList','BulletedList','-','Outdent','Indent','-','Blockquote','CreateDiv','-','JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock' ] },
3637
{ name: 'links', items : [ 'Link','Unlink','Anchor' ] },
37-
{ name: 'insert', items : [ 'Image','allmedias','Flash','Table','HorizontalRule','Smiley','SpecialChar','PageBreak' ] },
38+
{ name: 'insert', items : [ 'Image','mediaofcontribution','imagebank','Video','Html5audio','Iframe','filebank','Table','HorizontalRule','Smiley','SpecialChar','PageBreak', 'variables' ] },
3839
'/',
3940
{ name: 'styles', items : [ 'Styles','Format','Font','FontSize' ] },
4041
{ name: 'colors', items : [ 'TextColor','BGColor' ] },

quizz/quizz-war/src/main/webapp/quizz/jsp/questionCreator.jsp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ String m_context = ResourceLocator.getGeneralSettingBundle().getString("Applicat
5050
5151
int nbZone = 4; // number of field to control
5252
List<ComponentInstLight> galleries = quizzScc.getGalleries();
53-
if (galleries != null) {
53+
if (!galleries.isEmpty()) {
5454
nbZone = nbZone + 2;
5555
}
5656
@@ -603,7 +603,7 @@ if ((action.equals("CreateQuestion")) || (action.equals("SendQuestionForm"))) {
603603

604604
<div class="thumbnailInputs">
605605
<img title="<%=surveyResource.getString("survey.answer.image.select")%>" alt="<%=surveyResource.getString("survey.answer.image.select")%>" src="/silverpeas/util/icons/images.png" /> <input type="file" id="thumbnailFile" size="40" name="image<%=i%>" />
606-
<%if (galleries != null) {%>
606+
<%if (!galleries.isEmpty()) {%>
607607
<span class="txtsublibform"> ou </span><input type="hidden" name="valueImageGallery<%= i %>" id="valueImageGallery<%= i %>"/>
608608
<select class="galleries" name="galleries" onchange="choixGallery(this, '<%= i %>');this.selectedIndex=0;">
609609
<option selected><%= surveyResource.getString("GML.thumbnail.galleries") %></option>

quizz/quizz-war/src/main/webapp/quizz/jsp/questionCreatorBis.jsp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ String m_context = ResourceLocator.getGeneralSettingBundle().getString("Applicat
4444
4545
int nbZone = 4; // nombre de zones � contr�ler
4646
List<ComponentInstLight> galleries = quizzScc.getGalleries();
47-
if (galleries != null) {
47+
if (!galleries.isEmpty()) {
4848
nbZone = nbZone + 2;
4949
}
5050
@@ -490,7 +490,7 @@ if ((action.equals("CreateQuestion")) || (action.equals("SendQuestionForm"))) {
490490

491491
<div class="thumbnailInputs">
492492
<img title="<%=surveyResource.getString("survey.answer.image.select")%>" alt="<%=surveyResource.getString("survey.answer.image.select")%>" src="/silverpeas/util/icons/images.png" /> <input type="file" id="thumbnailFile" size="40" name="image<%=i%>" />
493-
<%if (galleries != null) {%>
493+
<%if (!galleries.isEmpty()) {%>
494494
<span class="txtsublibform"> ou </span><input type="hidden" name="valueImageGallery<%= i %>" id="valueImageGallery<%= i %>"/>
495495
<select class="galleries" name="galleries" onchange="choixGallery(this, '<%= i %>');this.selectedIndex=0;">
496496
<option selected><%= surveyResource.getString("GML.thumbnail.galleries") %></option>

webSites/webSites-war/src/main/java/org/silverpeas/components/websites/servlets/WebSitesRequestRouter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -736,7 +736,7 @@ private String toWysiwygEditor(final WebSiteSessionController scc, final HttpReq
736736
WysiwygRouting.WysiwygRoutingContext.fromComponentSessionController(scc)
737737
.withContributionId(ContributionIdentifier.from(scc.getComponentId(), id, UNKNOWN))
738738
.withBrowseInfo(URLEncoder.encode(nameSite, "UTF-8"))
739-
.withFileName(URLEncoder.encode(nameSite, "UTF-8") + FOLDER_PATH_FILTER +
739+
.withFileName(URLEncoder.encode(name, "UTF-8") + FOLDER_PATH_FILTER +
740740
URLEncoder.encode(path, "UTF-8"))
741741
.withLanguage(I18NHelper.defaultLanguage)
742742
.withComeBackUrl(URLEncoder.encode(URLUtil.getApplicationURL() +

0 commit comments

Comments
 (0)