Skip to content

Commit

Permalink
LPS-25035 - Source formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
@natecavanaugh @brianchandotcom
natecavanaugh authored and brianchandotcom committed May 14, 2012
1 parent c3da499 commit bac598f
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion portal-web/docroot/html/portlet/document_library_display/file_entry_columns.jspf
View file
Expand Up @@ -68,7 +68,7 @@ for (int j = 0; j < fileEntryColumns.length; j++) {
<img class="thumbnail" src="<%= thumbnailSrc %>" /> <img class="thumbnail" src="<%= thumbnailSrc %>" />


<c:if test="<%= fileShortcut != null %>"> <c:if test="<%= fileShortcut != null %>">
<img alt="<liferay-ui:message key="shortcut" />" class="shortcut-icon" src="<%= themeDisplay.getPathThemeImages() %>/file_system/large/overlay_link.png"> <img alt="<liferay-ui:message key="shortcut" />" class="shortcut-icon" src="<%= themeDisplay.getPathThemeImages() %>/file_system/large/overlay_link.png" />
</c:if> </c:if>


<c:if test="<%= fileEntry.isCheckedOut() %>"> <c:if test="<%= fileEntry.isCheckedOut() %>">
Expand Down
2 changes: 1 addition & 1 deletion portal-web/docroot/html/portlet/image_gallery_display/css/main.css
View file
Expand Up @@ -25,6 +25,7 @@
height: 170px; height: 170px;
margin: 10px 4px; margin: 10px 4px;
padding: 5px 15px 0; padding: 5px 15px 0;
text-align: center;


&:hover, &.hover { &:hover, &.hover {
background-color: #D3E8F1; background-color: #D3E8F1;
Expand Down Expand Up @@ -52,7 +53,6 @@
.image-thumbnail { .image-thumbnail {
display: inline-block; display: inline-block;
position: relative; position: relative;
text-align: center;


img { img {
background: #EAEAEA; background: #EAEAEA;
Expand Down
12 changes: 6 additions & 6 deletions portal-web/docroot/html/portlet/image_gallery_display/view_images.jspf
View file
Expand Up @@ -96,7 +96,7 @@


<div class="image-icon"> <div class="image-icon">
<a class="image-link preview" <%= (hasAudio || hasVideo) ? "data-options=\"height=" + playerHeight + "&thumbnailURL=" + HtmlUtil.escapeURL(DLUtil.getPreviewURL(fileEntry, fileVersion, themeDisplay, "&videoThumbnail=1")) + "&width=640" + dataOptions + "\"" : StringPool.BLANK %> href="<%= href %>" thumbnailId="<%= thumbnailId %>" title="<%= HtmlUtil.escape(fileEntry.getTitle()) + " - " + HtmlUtil.escape(fileEntry.getDescription()) %>"> <a class="image-link preview" <%= (hasAudio || hasVideo) ? "data-options=\"height=" + playerHeight + "&thumbnailURL=" + HtmlUtil.escapeURL(DLUtil.getPreviewURL(fileEntry, fileVersion, themeDisplay, "&videoThumbnail=1")) + "&width=640" + dataOptions + "\"" : StringPool.BLANK %> href="<%= href %>" thumbnailId="<%= thumbnailId %>" title="<%= HtmlUtil.escape(fileEntry.getTitle()) + " - " + HtmlUtil.escape(fileEntry.getDescription()) %>">
<div class="image-thumbnail" style="<%= DLUtil.getThumbnailStyle(false, 4) %>"> <span class="image-thumbnail" style="<%= DLUtil.getThumbnailStyle(false, 4) %>">
<img alt="<%= HtmlUtil.escape(fileEntry.getTitle()) + " - " + HtmlUtil.escape(fileEntry.getDescription()) %>" border="no" src="<%= src %>" style="max-height: <%= PropsValues.DL_FILE_ENTRY_THUMBNAIL_MAX_HEIGHT %>px; max-width: <%= PropsValues.DL_FILE_ENTRY_THUMBNAIL_MAX_WIDTH %>px;" /> <img alt="<%= HtmlUtil.escape(fileEntry.getTitle()) + " - " + HtmlUtil.escape(fileEntry.getDescription()) %>" border="no" src="<%= src %>" style="max-height: <%= PropsValues.DL_FILE_ENTRY_THUMBNAIL_MAX_HEIGHT %>px; max-width: <%= PropsValues.DL_FILE_ENTRY_THUMBNAIL_MAX_WIDTH %>px;" />


<c:if test="<%= fileShortcut != null %>"> <c:if test="<%= fileShortcut != null %>">
Expand All @@ -106,7 +106,7 @@
<c:if test="<%= fileEntry.isCheckedOut() %>"> <c:if test="<%= fileEntry.isCheckedOut() %>">
<img alt="<liferay-ui:message key="locked" />" class="locked-icon" src="<%= themeDisplay.getPathThemeImages() %>/file_system/large/overlay_lock.png" /> <img alt="<liferay-ui:message key="locked" />" class="locked-icon" src="<%= themeDisplay.getPathThemeImages() %>/file_system/large/overlay_lock.png" />
</c:if> </c:if>
</div> </span>


<span class="image-title"><%= HtmlUtil.escape(fileVersion.getTitle()) %></span> <span class="image-title"><%= HtmlUtil.escape(fileVersion.getTitle()) %></span>
</a> </a>
Expand Down Expand Up @@ -159,9 +159,9 @@


<div class="image-icon"> <div class="image-icon">
<a class="image-link" href="<%= viewFolderURL.toString() %>" title="<%= HtmlUtil.escape(curFolder.getName()) + " - " + HtmlUtil.escape(curFolder.getDescription()) %>"> <a class="image-link" href="<%= viewFolderURL.toString() %>" title="<%= HtmlUtil.escape(curFolder.getName()) + " - " + HtmlUtil.escape(curFolder.getDescription()) %>">
<div class="image-thumbnail"> <span class="image-thumbnail">
<img alt="" border="no" src="<%= folderImageSrc %>" style="max-height: <%= PropsValues.DL_FILE_ENTRY_THUMBNAIL_MAX_HEIGHT %>px; max-width: <%= PropsValues.DL_FILE_ENTRY_THUMBNAIL_MAX_WIDTH %>px;" /> <img alt="" border="no" src="<%= folderImageSrc %>" style="max-height: <%= PropsValues.DL_FILE_ENTRY_THUMBNAIL_MAX_HEIGHT %>px; max-width: <%= PropsValues.DL_FILE_ENTRY_THUMBNAIL_MAX_WIDTH %>px;" />
</div> </span>


<span class="image-title"><%= HtmlUtil.escape(StringUtil.shorten(curFolder.getName(), 60)) %></span> <span class="image-title"><%= HtmlUtil.escape(StringUtil.shorten(curFolder.getName(), 60)) %></span>
</a> </a>
Expand Down Expand Up @@ -209,9 +209,9 @@
} }
%> %>


<div class="image-thumbnail"> <span class="image-thumbnail">
<img alt="" border="no" src="<%= folderImageSrc %>" style="max-height: <%= PropsValues.DL_FILE_ENTRY_THUMBNAIL_MAX_HEIGHT %>px; max-width: <%= PropsValues.DL_FILE_ENTRY_THUMBNAIL_MAX_WIDTH %>px;" /> <img alt="" border="no" src="<%= folderImageSrc %>" style="max-height: <%= PropsValues.DL_FILE_ENTRY_THUMBNAIL_MAX_HEIGHT %>px; max-width: <%= PropsValues.DL_FILE_ENTRY_THUMBNAIL_MAX_WIDTH %>px;" />
</div> </span>


<span class="image-title"><%= HtmlUtil.escape(StringUtil.shorten(curFolder.getName(), 60)) %></span> <span class="image-title"><%= HtmlUtil.escape(StringUtil.shorten(curFolder.getName(), 60)) %></span>
</a> </a>
Expand Down

0 comments on commit bac598f

Please sign in to comment.