Skip to content

S
sbsoft
Commit f23b98fc by farax
Options

video-news

parent 830d034a
Showing with 112 additions and 67 deletions
modules/video-news/src/main/java/ru/systematic/cisstat/portlet/display/context/VideoNewsDisplayContext.java
...@@ -96,6 +96,11 @@ public class VideoNewsDisplayContext { ...@@ -96,6 +96,11 @@ public class VideoNewsDisplayContext {
return _position; return _position;
} }
public Boolean isallLevelsPDF() {
_allLevelsPDF = GetterUtil.getBoolean(_portletPreferences.getValue("allLevelsPDF","0"), false);
return _allLevelsPDF;
}
public int getDelta() { public int getDelta() {
_delta = GetterUtil.getInteger(_portletPreferences.getValue("delta","4"),4); _delta = GetterUtil.getInteger(_portletPreferences.getValue("delta","4"),4);
return _delta; return _delta;
...@@ -326,5 +331,7 @@ public class VideoNewsDisplayContext { ...@@ -326,5 +331,7 @@ public class VideoNewsDisplayContext {
private int _delta; private int _delta;
private String _displayStyle; private String _displayStyle;
private boolean _position; private boolean _position;
private boolean _allLevelsPDF;
} }
modules/video-news/src/main/resources/META-INF/resources/configuration.jsp
...@@ -66,6 +66,8 @@ ...@@ -66,6 +66,8 @@
<aui:input helpMessage="horizontally-vertically" name="preferences--position--" type="toggle-switch" value="<%= assetPublisherDisplayContext.getPosition() %>" /> <aui:input helpMessage="horizontally-vertically" name="preferences--position--" type="toggle-switch" value="<%= assetPublisherDisplayContext.getPosition() %>" />
<aui:input name="preferences--allLevelsPDF--" type="toggle-switch" value="<%= assetPublisherDisplayContext.isallLevelsPDF() %>"/>
<aui:input name="preferences--selectedMimeTypes--" type="hidden" /> <aui:input name="preferences--selectedMimeTypes--" type="hidden" />
<aui:input name="preferences--styleID--" type="text" value="<%= assetPublisherDisplayContext.getStyleID() %>"/> <aui:input name="preferences--styleID--" type="text" value="<%= assetPublisherDisplayContext.getStyleID() %>"/>
......
modules/video-news/src/main/resources/META-INF/resources/view.jsp
...@@ -14,6 +14,10 @@ ...@@ -14,6 +14,10 @@
OrderByComparator orderByComparator = DLUtil.getRepositoryModelOrderByComparator("modifiedDate", "desc"); OrderByComparator orderByComparator = DLUtil.getRepositoryModelOrderByComparator("modifiedDate", "desc");
List<FileEntry> fileEntries = DLAppServiceUtil.getGroupFileEntries(scopeGroupId, 0, folderId, currentMimeTypes, status, 0, max_delta, orderByComparator); List<FileEntry> fileEntries = DLAppServiceUtil.getGroupFileEntries(scopeGroupId, 0, folderId, currentMimeTypes, status, 0, max_delta, orderByComparator);
List <Object> foldersAndFileEntriesAndFileShortcuts = DLAppServiceUtil.getFoldersAndFileEntriesAndFileShortcuts(scopeGroupId, folderId, WorkflowConstants.STATUS_ANY,
true, QueryUtil.ALL_POS, QueryUtil.ALL_POS);
//List<DLFileEntry> dlssss = DLFileEntryLocalServiceUtil.getFileEntries(scopeGroupId, folder.getFolderId(), status, QueryUtil.ALL_POS, QueryUtil.ALL_POS, orderByComparator); //List<DLFileEntry> dlssss = DLFileEntryLocalServiceUtil.getFileEntries(scopeGroupId, folder.getFolderId(), status, QueryUtil.ALL_POS, QueryUtil.ALL_POS, orderByComparator);
//System.out.println(fileEntries.size()); //System.out.println(fileEntries.size());
%> %>
...@@ -29,75 +33,99 @@ ...@@ -29,75 +33,99 @@
</style> </style>
<div class="text-justify"> <%
<ul class="display-style-icon list-unstyled row" id="<%= styleID %>"> if (assetPublisherDisplayContext.isallLevelsPDF()) {
<%
for(FileEntry fileEntry : fileEntries){ %>
<div class="text-justify">
FileVersion fileVersion = DLAppServiceUtil.getFileVersion(fileEntry.getFileVersion().getFileVersionId()); <%= "rrrrrrrrrrrrrrrrrrr" %><br>
String thumbnailImage = DLUtil.getPreviewURL(fileEntry, fileVersion, themeDisplay, "&videoThumbnail=1"); </div>
if(VideoProcessorUtil.hasVideo(fileVersion)){ <%
}else{
%>
<div class="text-justify">
<ul class="display-style-icon list-unstyled row" id="<%= styleID %>">
<%
for(FileEntry fileEntry : fileEntries){
String src = DLUtil.getPreviewURL(fileEntry, fileVersion, themeDisplay, "&videoPreview=1"+"&type=" + "mp4"); FileVersion fileVersion = DLAppServiceUtil.getFileVersion(fileEntry.getFileVersion().getFileVersionId());
//String oo = PropsUtil.get(PropsKeys.DL_FILE_ENTRY_PREVIEW_VIDEO_CONTAINERS); String thumbnailImage = DLUtil.getPreviewURL(fileEntry, fileVersion, themeDisplay, "&videoThumbnail=1");
%> if(VideoProcessorUtil.hasVideo(fileVersion)){
<li class="lfr-asset-item video" style="<%= fileEntries.size()==1 ? "text-align:center;" : "" %>">
<video src="<%= src %>" poster="<%= thumbnailImage %>" controls width="<%= assetPublisherDisplayContext.getWidthVideo() %>"></video> String src = DLUtil.getPreviewURL(fileEntry, fileVersion, themeDisplay, "&videoPreview=1"+"&type=" + "mp4");
<div class="cis-text-color" style="white-space: nowrap;"><%= fileEntry.getTitle() %></div> //String oo = PropsUtil.get(PropsKeys.DL_FILE_ENTRY_PREVIEW_VIDEO_CONTAINERS);
</li> %>
<% <li class="lfr-asset-item video" style="<%= fileEntries.size()==1 ? "text-align:center;" : "" %>">
}else if(ImageProcessorUtil.hasImages(fileVersion)){ <video src="<%= src %>" poster="<%= thumbnailImage %>" controls width="<%= assetPublisherDisplayContext.getWidthVideo() %>"></video>
%> <div class="cis-text-color" style="white-space: nowrap;"><%= fileEntry.getTitle() %></div>
<li class="lfr-asset-item"> </li>
<div class="image-link preview" href="<%= DLUtil.getPreviewURL(fileEntry, fileVersion, themeDisplay, "") %>"> <%
<div class="taglib-vertical-card entry-display-style"> }else if(ImageProcessorUtil.hasImages(fileVersion)){
<div class="clients-item"> %>
<% if(!assetPublisherDisplayContext.isOneStaticPhoto()){ %> <li class="lfr-asset-item">
<div class="aspect-ratio aspect-ratio-bg-center aspect-ratio-bg-cover" style="background-image: url('<%= DLUtil.getPreviewURL(fileEntry,fileVersion, themeDisplay, "&imageThumbnail=1") %>');cursor: pointer;"> <div class="image-link preview" href="<%= DLUtil.getPreviewURL(fileEntry, fileVersion, themeDisplay, "") %>">
<div class="taglib-vertical-card entry-display-style">
<div class="clients-item">
<% if(!assetPublisherDisplayContext.isOneStaticPhoto()){ %>
<div class="aspect-ratio aspect-ratio-bg-center aspect-ratio-bg-cover" style="background-image: url('<%= DLUtil.getPreviewURL(fileEntry,fileVersion, themeDisplay, "&imageThumbnail=1") %>');cursor: pointer;">
</div>
<% }else{ %>
<img alt="" src="<%= DLUtil.getPreviewURL(fileEntry,fileVersion, themeDisplay, "&imageThumbnail=1") %>">
<% } %>
</div> </div>
<% }else{ %>
<img alt="" src="<%= DLUtil.getPreviewURL(fileEntry,fileVersion, themeDisplay, "&imageThumbnail=1") %>">
<% } %>
</div> </div>
<div class="cis-text-color"><%= fileEntry.getTitle() %></div>
</div> </div>
<div class="cis-text-color"><%= fileEntry.getTitle() %></div> </li>
</div>
</li>
<%
<% }else if(PDFProcessorUtil.hasImages(fileVersion)){
}else if(PDFProcessorUtil.hasImages(fileVersion)){ String imageURL = DLUtil.getPreviewURL(fileEntry, fileVersion, themeDisplay, "&previewFileIndex=1");
String imageURL = DLUtil.getPreviewURL(fileEntry, fileVersion, themeDisplay, "&previewFileIndex=1"); %>
%>
<%-- <div class="image-link preview">
<%= imageURL %> <%-- <div class="image-link preview">
</div> --%> <%= imageURL %>
<%-- <li class="lfr-asset-item"> </div> --%>
<div class="image-link preview" href="<%= imageURL %>"> <%-- <li class="lfr-asset-item">
<div class="taglib-vertical-card entry-display-style"> <div class="image-link preview" href="<%= imageURL %>">
<div class="clients-item"> <div class="taglib-vertical-card entry-display-style">
<% if(!assetPublisherDisplayContext.isOneStaticPhoto()){ %> <div class="clients-item">
<div class="aspect-ratio aspect-ratio-bg-center aspect-ratio-bg-cover" style="background-image: url('<%= imageURL %>');cursor: pointer;"></div> <% if(!assetPublisherDisplayContext.isOneStaticPhoto()){ %>
<% }else{ %> <div class="aspect-ratio aspect-ratio-bg-center aspect-ratio-bg-cover" style="background-image: url('<%= imageURL %>');cursor: pointer;"></div>
<img alt="" src="<%= imageURL %>"> <% }else{ %>
<% } %> <img alt="" src="<%= imageURL %>">
<% } %>
</div>
<div>
<%= fileEntry.getTitle() %>
</div>
</div> </div>
</div> </div>
</li> --%>
<div class="pdf-column1">
<a href="<%= DLUtil.getDownloadURL(fileEntry, fileVersion, themeDisplay, "") %>">
<img alt="" src="<%=request.getContextPath()%>/img/pdficon.png"> <span><%= fileEntry.getTitle() %></span>
</a>
</div> </div>
</li> --%>
<div class="pdf-column1">
<a href="<%= DLUtil.getDownloadURL(fileEntry, fileVersion, themeDisplay, "") %>">
<img alt="" src="<%=request.getContextPath()%>/img/pdficon.png"> <span><%= fileEntry.getTitle() %></span>
</a>
</div>
<%
<%
}
} }
} %>
%> </ul>
</ul> </div>
</div>
<%
}
%>
<%-- <div class="text-justify"> <%-- <div class="text-justify">
<% <%
......
modules/video-news/src/main/resources/content/Language_ru.properties
horizontally-vertically=горизонтально/вертикално horizontally-vertically=горизонтально/вертикално
isOneStaticPhoto=Если одна статическое фото isOneStaticPhoto=Если одна статическое фото
widthVideo=Ширина видео widthVideo=Ширина видео
\ No newline at end of file allLevelsPDF=Показать все содержимое папки PDF
\ No newline at end of file
templates/preview/asset publisher/new_publications.ftl
...@@ -7,23 +7,30 @@ ...@@ -7,23 +7,30 @@
entryId = entry.getEntryId() entryId = entry.getEntryId()
assetRenderer = entry.getAssetRenderer() assetRenderer = entry.getAssetRenderer()
entryTitle = htmlUtil.escape(assetRenderer.getTitle(locale)) entryTitle = htmlUtil.escape(assetRenderer.getTitle(locale))
viewURL = assetPublisherHelper.getAssetViewURL(renderRequest, renderResponse, entry, true)
/> />
<#assign docXml = saxReaderUtil.read(entry.getAssetRenderer().getArticle().getContent()) /> <#assign docXml = saxReaderUtil.read(entry.getAssetRenderer().getArticle().getContent()) />
<#assign ddmimg = docXml.valueOf("//dynamic-element[@name='image_publication']/dynamic-content/text()") /> <#assign ddmimg = docXml.valueOf("//dynamic-element[@name='image_publication']/dynamic-content/text()") />
<#assign href = docXml.valueOf("//dynamic-element[@name='readmore']/dynamic-content/text()") /> <#assign href = viewURL />
<#assign publication_note = docXml.valueOf("//dynamic-element[@name='publication_note']/dynamic-content/text()") /> <#assign publication_note = docXml.valueOf("//dynamic-element[@name='publication_note']/dynamic-content/text()") />
<li class="lfr-asset-item"> <li class="lfr-asset-item col-md-4">
<div class="taglib-vertical-card entry-display-style "> <div class="taglib-vertical-card entry-display-style">
<div class="editIcon"> <div class="editIcon">
<span><@getEditIcon /></span> <span><@getEditIcon /></span>
</div> </div>
<div class="card"> <div class="card">
<a href="${href}" target="_blank"> <a href="${href}">
<div class="aspect-ratio aspect-ratio-bg-center aspect-ratio-bg-cover" style="background-image: url('${ddmimg}&imagePreview=1')"></div> <div class="aspect-ratio aspect-ratio-bg-center aspect-ratio-bg-cover" style="background-image: url('${ddmimg}&imagePreview=1')"></div>
</a> </a>
</div> </div>
<div class="cis-text-color">${entryTitle}</div> <div class="cis-text-color">
<p class="note">${publication_note}</p> <a href="${href}">
${entryTitle}
</a>
</div>
<a href="${href}">
<p class="note">${publication_note}</p>
</a>
</div> </div>
</li> </li>
</#list> </#list>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment