dev

.gitignore

@@ -28,3 +28,5 @@ test-results
 /modules/custom-init
 /bundles_old
 /bundles_new
+/wars/dinar
+/.metadata

modules/video-news/src/main/resources/META-INF/resources/init.jsp

+<%@page import="com.liferay.portal.kernel.language.LanguageUtil"%>
 <%@page import="com.liferay.portal.kernel.util.FastDateFormatFactoryUtil"%>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
@@ -93,6 +94,8 @@
 	
 	String displayStyle = assetPublisherDisplayContext.getDisplayStyle();
 	long displayStyleGroupId = themeDisplay.getScopeGroupId();
+	
+	//LanguageUtil.ge
 %>
 
 

modules/video-news/src/main/resources/META-INF/resources/view.jsp

@@ -38,13 +38,17 @@
 
 .my-menu{
 	padding-left: 15px;
+	padding-right: 15px;
 }
 
 .my-menu ul>li{
-	padding-right:15px;
+	padding-right: 15px;
 	padding-left: 15px;
 }
 
+<%= "#" + styleID %>{
+	padding-right: 15px;
+}
 </style>
 
 <%
@@ -60,7 +64,8 @@
 				
 %>
 	<div class="text-justify">
-		<%= "file="+fileEntryPDF.getFileName() %><br>
+		<%= !Validator.isBlank(fileEntryPDF.getDescription()) ? fileEntryPDF.getDescription() : "<span style='color:red;'>"+LanguageUtil.get(request, "warningEmmptyDiscription")+"</span>" %>
+		<%--= "file="+fileEntryPDF.getTitle() --%><br>
 	</div>
 <%
 			} else if (folderAndFileEntryAndFileShortcut instanceof Folder) {
@@ -68,7 +73,7 @@
 %>
 	<div class="text-justify">
 		<ul id='<%= "my-menu" + styleID %>' class="my-menu">
-			<li><a href=""><%= subFolderPDF.getDescription() %></a>
+			<li><a href=""><%= !Validator.isBlank(subFolderPDF.getDescription()) ? subFolderPDF.getDescription() : "<span style='color:red;'>"+LanguageUtil.get(request, "warningEmmptyDiscription")+"</span>" %></a>
 					<ul style="display: none;list-style-type: none;padding-left: 0;">
 						<%
 							List<FileEntry> fileEntriessss = DLAppServiceUtil.getGroupFileEntries(scopeGroupId, 0, subFolderPDF.getFolderId(), currentMimeTypes, status, -1, -1, orderByComparator);
@@ -78,7 +83,9 @@
 						
 						<li>
 							<img alt="" src="<%=request.getContextPath()%>/img/pdficon.png">
-							<a href="<%= DLUtil.getDownloadURL(entry, fileVersion, themeDisplay, "") %>"><%= entry.getFileName() %>
+							<a href="<%= DLUtil.getDownloadURL(entry, fileVersion, themeDisplay, "") %>">
+							<%= !Validator.isBlank(entry.getDescription()) ? entry.getDescription() : "<span style='color:red;'>"+LanguageUtil.get(request, "warningEmmptyDiscription")+"</span>" %>
+							<%--= entry.getFileName() --%>
 						</li>
 						
 						<% } %>
@@ -160,7 +167,11 @@
 	
 					<div class="pdf-column1">
 						<a href="<%= DLUtil.getDownloadURL(fileEntry, fileVersion, themeDisplay, "") %>">
-							<img alt="" src="<%=request.getContextPath()%>/img/pdficon.png"> <span><%= fileEntry.getTitle() %></span>
+							<img alt="" src="<%=request.getContextPath()%>/img/pdficon.png">
+							<span>
+								<%= !Validator.isBlank(fileEntry.getDescription()) ? fileEntry.getDescription() : "<span style='color:red;'>"+LanguageUtil.get(request, "warningEmmptyDiscription")+"</span>" %>
+								<%--= fileEntry.getTitle() --%>
+							</span>
 						</a>
 					</div>
 					

modules/video-news/src/main/resources/content/Language_ru.properties

@@ -2,3 +2,4 @@ horizontally-vertically=горизонтально/вертикално
 isOneStaticPhoto=Если одна статическое фото
 widthVideo=Ширина видео
 allLevelsPDF=Показать все содержимое папки PDF
+warningEmmptyDiscription=Здесь отображается описание!!! Заполните описание файла!!!
\ No newline at end of file

templates/preview/navigation menu/cisstat_navigation_menu.ftl

+<style>
+.far{
+	color:red;
+}
+.nav-active a span{
+	font-weight: bold;
+}
+</style>
+<#if !entries?has_content>
+	<#if preview>
+		<div class="alert alert-info">
+			<@liferay.language key="there-are-no-pages-to-display-for-the-current-page-level" />
+		</div>
+	</#if>
+<#else>
+	<#assign
+		portletDisplay = themeDisplay.getPortletDisplay()
+
+		navbarId = "navbar_" + portletDisplay.getId()
+	/>
+	<div id="${navbarId}">
+		<ul class="tt" id="my-menu-nav" style="list-style-type: none;">
+			<h1 class="hide-accessible"><@liferay.language key="navigation" /></h1>
+
+			<#assign navItems = entries />
+
+			<#list navItems as navItem>
+				
+				<#assign showChildren = navItem.hasBrowsableChildren() />
+
+				<#if navItem.isBrowsable() || showChildren>
+					<#assign
+						nav_item_attr_has_popup = ""
+						nav_item_attr_selected = ""
+						nav_item_caret = ""
+						nav_item_css_class = "lfr-nav-item"
+						nav_item_href_link = ""
+						ins = ""
+						nav_item_link_css_class = ""
+					/>
+
+					<#if showChildren>
+
+						<#assign nav_item_caret = '<span class="lfr-nav-child-toggle"><i class="${ins}"></i></span>' />
+						<#assign
+							nav_item_css_class = "${nav_item_css_class}"
+							<#-- nav_item_link_css_class = "dropdown-toggle" -->
+						/>
+					</#if>
+
+					<#if navItem.isBrowsable()>
+						<#assign nav_item_href_link = "href='${navItem.getURL()}'" />
+					</#if>
+					
+					<#if showChildren == true>
+						<#assign nav_item_href_link = "href='#'" />
+						<#assign ins = "style='list-style-type: disc;'" />
+					</#if>
+					
+					<#if navItem.isSelected()>
+						<#assign
+							nav_item_attr_selected = "aria-selected='true'"
+							nav_item_css_class = "${nav_item_css_class} selected active"
+						/>
+					</#if>
+
+					<li class="${nav_item_css_class}" ${ins} id="layout_${navItem.getLayoutId()}" ${nav_item_attr_selected}>
+						<a class="${nav_item_link_css_class}" ${nav_item_href_link} ${navItem.getTarget()}>
+							<span><@liferay_theme["layout-icon"] layout=navItem.getLayout() /> ${navItem.getName()} ${nav_item_caret}</span>
+						</a>
+
+						<#if showChildren>
+							<ul class="child-menu" style="display:none;" id="ul_layout_${navItem.getLayoutId()}">
+								<#list navItem.getBrowsableChildren() as childNavigationItem>
+									<#assign
+										nav_child_attr_selected = ""
+										nav_child_css_class = ""
+									/>
+
+									<#if childNavigationItem.isSelected()>
+										<#assign
+											nav_child_attr_selected = "aria-selected='true'"
+											nav_child_css_class = "active selected"
+										/>
+										<script>
+											$('ul#ul_layout_${navItem.getLayoutId()}').removeAttr("style");
+											$('#layout_${navItem.getLayoutId()}').addClass('nav-active');
+										</script>
+									</#if>
+
+									<li class="${nav_child_css_class}" id="layout_${childNavigationItem.getLayoutId()}" ${nav_child_attr_selected} role="presentation">
+										<a href="${childNavigationItem.getURL()}" ${childNavigationItem.getTarget()}>${childNavigationItem.getName()}</a>
+									</li>
+								</#list>
+							</ul>
+						</#if>
+					</li>
+				</#if>
+			</#list>
+		</ul>
+	</div>
+
+	<@liferay_aui.script use="liferay-navigation-interaction">
+		var navigation = A.one('#${navbarId}');
+
+		Liferay.Data.NAV_INTERACTION_LIST_SELECTOR = '.navbar-site';
+		Liferay.Data.NAV_LIST_SELECTOR = '.navbar-site';
+
+		if (navigation) {
+			navigation.plug(Liferay.NavigationInteraction);
+		}
+	</@>
+</#if>
+
+<@liferay_aui.script>
+$(document).ready(function() {
+  $('ul#my-menu-nav ul').each(function(index) {
+    $(this).prev().addClass('collapsible').click(function() {
+      if ($(this).next().css('display') == 'none') {
+        $(this).next().slideDown(200, function () {
+          $(this).prev().removeClass('collapsed').addClass('expanded');
+        });
+      }else {
+        $(this).next().slideUp(200, function () {
+          $(this).prev().removeClass('collapsed').addClass('expanded');
+          $(this).find('ul').each(function() {
+            $(this).hide().prev().removeClass('expanded').addClass('collapsed');
+          });
+        });
+      }
+      return false;
+    });
+  });
+});
+</@>
\ No newline at end of file