diff --git a/dotCMS/WEB-INF/velocity/preview_mode.vl b/dotCMS/WEB-INF/velocity/preview_mode.vl index 45edf8ffa1a9..be6d7e820d8a 100644 --- a/dotCMS/WEB-INF/velocity/preview_mode.vl +++ b/dotCMS/WEB-INF/velocity/preview_mode.vl @@ -9,10 +9,9 @@ ##if have been loaded in the mainFrame #set($inframe=$request.getHeader("Referer")) -#if($inframe && $inframe.contains("mainFrame=true")) +#if($!inframe && ($inframe.contains("mainFrame=") || $inframe.contains("leftMenu="))) - diff --git a/dotCMS/html/portlet/ext/browser/view_browser.jsp b/dotCMS/html/portlet/ext/browser/view_browser.jsp index e23565470b71..3c1e351343bd 100644 --- a/dotCMS/html/portlet/ext/browser/view_browser.jsp +++ b/dotCMS/html/portlet/ext/browser/view_browser.jsp @@ -5,7 +5,18 @@ <%@ page import="com.dotmarketing.portlets.languagesmanager.model.Language" %> <%@page import="com.dotmarketing.business.web.WebAPILocator"%> +<% +com.dotmarketing.beans.Host myHost = WebAPILocator.getHostWebAPI().getCurrentHost(request); +Language defaultLang = APILocator.getLanguageAPI().getDefaultLanguage(); +String languageId = String.valueOf(defaultLang.getId()); + +if(session.getAttribute(com.dotmarketing.util.WebKeys.LANGUAGE_SEARCHED)!= null){ + languageId = (String) session.getAttribute(com.dotmarketing.util.WebKeys.LANGUAGE_SEARCHED); +} +List languages = (List)request.getAttribute (com.dotmarketing.util.WebKeys.LANGUAGES); + +%> -
- +
+
+ +
+ <%@include file="../contentlet/languages_select_inc.jsp" %> diff --git a/dotCMS/html/portlet/ext/browser/view_browser_js_inc.jsp b/dotCMS/html/portlet/ext/browser/view_browser_js_inc.jsp index 68eacdeebba1..50b4621b37dd 100644 --- a/dotCMS/html/portlet/ext/browser/view_browser_js_inc.jsp +++ b/dotCMS/html/portlet/ext/browser/view_browser_js_inc.jsp @@ -1,3 +1,4 @@ +<%@page import="com.dotmarketing.portlets.languagesmanager.model.Language"%> <%@page import="com.dotmarketing.business.APILocator"%> <%@page import="com.dotmarketing.portlets.htmlpageasset.business.HTMLPageAssetAPI"%> <%@page import="com.dotmarketing.portlets.htmlpages.business.HTMLPageAPI"%> @@ -12,6 +13,14 @@ <% Structure defaultFileAssetStructure = StructureCache.getStructureByName(FileAssetAPI.DEFAULT_FILE_ASSET_STRUCTURE_VELOCITY_VAR_NAME); + + +String selectedLang=String.valueOf(APILocator.getLanguageAPI().getDefaultLanguage().getId()); +if(session.getAttribute(com.dotmarketing.util.WebKeys.LANGUAGE_SEARCHED)!= null){ + selectedLang = (String) session.getAttribute(com.dotmarketing.util.WebKeys.LANGUAGE_SEARCHED); +} + + %> @@ -75,8 +84,11 @@ dojo.require("dotcms.dojo.push.PushHandler"); var myHost = '<%= (myHost != null) ? myHost.getHostname() :""%>'; var myHostId = '<%= (myHost != null) ? myHost.getIdentifier() : "" %>'; - var selectedLang = '<%= APILocator.getLanguageAPI().getDefaultLanguage().getId() %>'; + var selectedLang = '<%= selectedLang %>'; + + + //Dragging Events var AssetsDragObserver = Class.create(); @@ -864,7 +876,7 @@ dojo.require("dotcms.dojo.push.PushHandler"); var modUserName = shortenString(asset.modUserName, 20); var languageHTML = (asset.type=='htmlpage' && asset.isContentlet && multipleLanguages) ?" ("+asset.languageCode+ "_" +asset.countryCode+")":""; + ".gif\" width=\"16px\" height=\"11px\" style='margin-top:4px;float:left;' /> ("+asset.languageCode+ "_" +asset.countryCode+")":""; var html = '\n' + '
' + diff --git a/dotCMS/html/portlet/ext/contentlet/view_contentlets.jsp b/dotCMS/html/portlet/ext/contentlet/view_contentlets.jsp index dda123c7cab8..37a61c905135 100644 --- a/dotCMS/html/portlet/ext/contentlet/view_contentlets.jsp +++ b/dotCMS/html/portlet/ext/contentlet/view_contentlets.jsp @@ -45,11 +45,11 @@ String orderBy = "modDate desc"; Language defaultLang = APILocator.getLanguageAPI().getDefaultLanguage(); String languageId = String.valueOf(defaultLang.getId()); - if(request.getAttribute(com.dotmarketing.util.WebKeys.LANGUAGE_SEARCHED)!= null){ - selectedLanguage = (Language)request.getAttribute(com.dotmarketing.util.WebKeys.LANGUAGE_SEARCHED); + if(session.getAttribute(com.dotmarketing.util.WebKeys.LANGUAGE_SEARCHED)!= null){ + languageId = (String)session.getAttribute(com.dotmarketing.util.WebKeys.LANGUAGE_SEARCHED); } - long selectedLanguageId = selectedLanguage.getId(); - String lanId = request.getParameter("language"); + + String structureSelected = ""; if(UtilMethods.isSet(request.getParameter("structure_id"))){ @@ -91,13 +91,7 @@ if(UtilMethods.isSet(lastSearch.get("orderBy"))){ orderBy = (String) lastSearch.get("orderBy"); } - if (fieldsSearch.containsKey("languageId")) { - languageId = ((String) fieldsSearch.get("languageId")).trim(); - }else if (!fieldsSearch.isEmpty()){ - languageId = "0"; - }else if(lanId != null){ - languageId = lanId; - } + } if(!InodeUtils.isSet(structureSelected)){ @@ -227,7 +221,9 @@ ? "gearIcon" : (s.getStructureType() ==3) ? "formIcon" - : "fileIcon"; + : (s.getStructureType() ==4) + ? "fileIcon" + : "pageIcon"; diff --git a/dotCMS/html/portlet/ext/contentlet/view_contentlets_js_inc.jsp b/dotCMS/html/portlet/ext/contentlet/view_contentlets_js_inc.jsp index 3dc0449b5a50..07c93cd9d6fb 100644 --- a/dotCMS/html/portlet/ext/contentlet/view_contentlets_js_inc.jsp +++ b/dotCMS/html/portlet/ext/contentlet/view_contentlets_js_inc.jsp @@ -1692,21 +1692,26 @@ if(dijit.byId("checkAll")){ dijit.byId("checkAll").destroy(); } + th.setAttribute("valign","bottom"); + th.setAttribute("nowrap","true"); th.innerHTML = '  ' + getHeader(header); row.appendChild(th); } else { th.innHTML = th.innerHTML = getHeader(header); + th.setAttribute("valign","bottom"); row.appendChild(th); } } th = document.createElement('th'); - th.setAttribute("style","text-align:center;"); + th.setAttribute("valign","bottom"); + th.style.width="120px"; th.innerHTML = "<%= LanguageUtil.get(pageContext, "Last-Editor") %>"; row.appendChild(th); th = document.createElement('th'); - th.setAttribute("style","text-align:center;"); + th.setAttribute("valign","bottom"); + th.style.width="120px"; th.innerHTML = "<%= LanguageUtil.get(pageContext, "Last-Edit-Date") %>"; row.appendChild(th); @@ -1750,13 +1755,13 @@ //console.log(headers[j]); cell.setAttribute("align","left"); if (j == 0 && languages.length>1) { + cell.setAttribute("nowrap","true"); languageId = cellData["languageId"]; locale = ""; for (var n = 0; n < languages.length; ++n) { if (languages[n][0] == languageId) { - locale = " (" + languages[n][1] + "_" + languages[n][2] + ")"; - //locale = languages[n][1] + "_" + languages[n][2]; + locale = " (" + languages[n][1] + "_" + languages[n][2] + ")"; break; } } @@ -1766,6 +1771,7 @@ cell.innerHTML = locale; var cell = row.insertCell (row.cells.length); + var value = titleCell(cellData,cellData[header["fieldVelocityVarName"]], i); } else { @@ -1777,10 +1783,9 @@ cell.innerHTML = value; } var cell = row.insertCell (row.cells.length); - cell.setAttribute("nowrap","true"); cell.innerHTML = cellData["modUser"]; cell.style.whiteSpace="nowrap"; - cell.style.textAlign="center"; + var cell = row.insertCell (row.cells.length); cell.setAttribute("nowrap","true"); cell.style.textAlign="right"; diff --git a/dotCMS/index.jsp b/dotCMS/index.jsp deleted file mode 100644 index 43b4c7a61238..000000000000 --- a/dotCMS/index.jsp +++ /dev/null @@ -1,193 +0,0 @@ -<%@ page import="com.dotmarketing.util.UtilMethods" %> -<%@ page import="com.dotmarketing.beans.Host" %> -<%@ page import="com.dotmarketing.business.web.WebAPILocator"%> -<% -Host host = WebAPILocator.getHostWebAPI().getCurrentHost(request); -boolean ADMIN_MODE = (session.getAttribute(com.dotmarketing.util.WebKeys.ADMIN_MODE_SESSION) != null); -String pointer = null; - -if(!ADMIN_MODE && !host.isLive()) { - //Checking if it has a maintenance virtual link - pointer = (String) VirtualLinksCache.getPathFromCache(host.getHostname() + ":/cmsMaintenancePage"); - if(pointer == null) { - try { - Company company = CompanyUtils.getDefaultCompany(); - response.sendError(HttpServletResponse.SC_SERVICE_UNAVAILABLE, LanguageUtil.get(company.getCompanyId(), company.getLocale(), "server-unavailable-error-message")); - } catch (LanguageException e) { - Logger.error(CMSFilter.class, e.getMessage(), e); - response.sendError(HttpServletResponse.SC_SERVICE_UNAVAILABLE); - } - return; - } -} - -if (!UtilMethods.isSet(pointer)) { - pointer = (String) com.dotmarketing.cache.VirtualLinksCache.getPathFromCache(host.getHostname() + ":/cmsHomePage"); -} -if (!UtilMethods.isSet(pointer)) { - pointer = (String) com.dotmarketing.cache.VirtualLinksCache.getPathFromCache("/cmsHomePage"); -} -if(UtilMethods.isSet(pointer)){ - if (pointer.startsWith("/")) { - request.getRequestDispatcher(pointer).forward(request, response); - } else { - response.sendRedirect(pointer); - } -} -else{ -%> - - - - <%@page import="java.util.GregorianCalendar"%> -<%@page import="java.util.Calendar"%> -<%@page import="com.dotmarketing.factories.ClickstreamFactory"%> -<%@page import="com.dotmarketing.util.Config"%> - -<%@page import="com.dotmarketing.cache.VirtualLinksCache"%> -<%@page import="com.liferay.portal.language.LanguageUtil"%> -<%@page import="com.liferay.portal.language.LanguageException"%> -<%@page import="com.dotmarketing.util.Logger"%> -<%@page import="com.dotmarketing.filters.CMSFilter"%> -<%@page import="com.dotmarketing.util.CompanyUtils"%> -<%@page import="com.liferay.portal.model.Company"%> - - dotCMS: Congratulations! You have sucessfully set up the dotCMS system - - - - - -
- - - -
-
-
-

C
ongratulations! You have successfully set up dotCMS - the open source content management system that makes sense. - - From here, you have a couple of options: - - -

-
-
Note: How to set your default home page -

You are seeting this because you do not have a home page set up. To set your real homepage, login to the administrative console, go to the "Website" tab and create a new vanity url called "/cmsHomePage" that points to the page you would like to be your home page, e.g. -

Create New Vanity URL:
 
   /cmsHomePage  »  Your Home Page
- - -
- -
- - -
- -
- - - - - - - -<%}%> diff --git a/src/com/dotmarketing/portlets/browser/ajax/BrowserAjax.java b/src/com/dotmarketing/portlets/browser/ajax/BrowserAjax.java index 6574ef813f22..a88306e1b3c8 100644 --- a/src/com/dotmarketing/portlets/browser/ajax/BrowserAjax.java +++ b/src/com/dotmarketing/portlets/browser/ajax/BrowserAjax.java @@ -277,8 +277,8 @@ public Map getFolderContent (String folderId, int offset, int ma } catch (Exception e) {} session.setAttribute(SELECTED_BROWSER_PATH_OBJECT, selectedBrowserPathObject); } - - req.getSession().setAttribute(WebKeys.HTMLPAGE_BROWSER_LANGUAGE, Long.toString(languageId)); + + req.getSession().setAttribute(WebKeys.LANGUAGE_SEARCHED, String.valueOf(languageId)); return browserAPI.getFolderContent(usr, folderId, offset, maxResults, filter, mimeTypes, extensions, showArchived, noFolders, onlyFiles, sortBy, sortByDesc, excludeLinks, languageId); } @@ -319,7 +319,7 @@ public Map getFolderContent (String folderId, int offset, int ma HttpServletRequest req = ctx.getHttpServletRequest(); User usr = getUser(req); - req.getSession().setAttribute(WebKeys.HTMLPAGE_BROWSER_LANGUAGE, Long.toString(languageId)); + req.getSession().setAttribute(WebKeys.LANGUAGE_SEARCHED, String.valueOf(languageId)); return browserAPI.getFolderContent(usr, folderId, offset, maxResults, filter, mimeTypes, extensions, showArchived, noFolders, onlyFiles, sortBy, sortByDesc, languageId); } @@ -379,8 +379,8 @@ public Map getFolderContent(String folderId, int offset, WebContext ctx = WebContextFactory.get(); HttpServletRequest req = ctx.getHttpServletRequest(); User usr = getUser(req); - req.getSession().setAttribute(WebKeys.HTMLPAGE_BROWSER_LANGUAGE, - Long.toString(this.languageAPI.getDefaultLanguage().getId())); + //Language selectedLang = APILocator.getLanguageAPI().getLanguage(languageId); + //req.getSession().setAttribute(WebKeys.LANGUAGE_SEARCHED, selectedLang); long getAllLanguages = 0; Map results = browserAPI.getFolderContent(usr, folderId, offset, maxResults, filter, mimeTypes, extensions, diff --git a/src/com/dotmarketing/portlets/contentlet/action/ViewContentletAction.java b/src/com/dotmarketing/portlets/contentlet/action/ViewContentletAction.java index 06b82ec8dc28..d38ff8f5c28a 100644 --- a/src/com/dotmarketing/portlets/contentlet/action/ViewContentletAction.java +++ b/src/com/dotmarketing/portlets/contentlet/action/ViewContentletAction.java @@ -116,8 +116,7 @@ else if (req.getParameter("structure_id") != null) } if(req.getParameter("selected_lang") != null){ - Language language = APILocator.getLanguageAPI().getLanguage(new Long(req.getParameter("selected_lang"))); - req.setAttribute(WebKeys.LANGUAGE_SEARCHED, language); + ((RenderRequestImpl)req).getHttpServletRequest().getSession().setAttribute(WebKeys.LANGUAGE_SEARCHED, req.getParameter("selected_lang")); } List languages = langAPI.getLanguages(); req.setAttribute(WebKeys.LANGUAGES, languages); diff --git a/src/com/dotmarketing/portlets/contentlet/ajax/ContentletAjax.java b/src/com/dotmarketing/portlets/contentlet/ajax/ContentletAjax.java index 071493bb8eb8..63d7437e7f40 100644 --- a/src/com/dotmarketing/portlets/contentlet/ajax/ContentletAjax.java +++ b/src/com/dotmarketing/portlets/contentlet/ajax/ContentletAjax.java @@ -581,6 +581,7 @@ public List searchContentletsByUser(String structureInode, List fields, Category category=null; String categoriesvalues=""; boolean first = true; + boolean allLanguages = true; for (String cat : categories) { try { category=catAPI.find(cat, currentUser, false); @@ -609,7 +610,10 @@ public List searchContentletsByUser(String structureInode, List fields, }else{ fieldsSearch.put(fieldName, fieldValue); } - + if(fieldName.equalsIgnoreCase("languageId")){ + sess.setAttribute(WebKeys.LANGUAGE_SEARCHED, String.valueOf(fieldValue)); + allLanguages = false; + } if(fieldName.equalsIgnoreCase("conhost")){ if(!filterSystemHost && !fieldValue.equals(Host.SYSTEM_HOST)){ try { @@ -758,6 +762,9 @@ else if( fieldbcontentname.startsWith("date") ){ } } } + if(allLanguages){ + sess.setAttribute(WebKeys.LANGUAGE_SEARCHED, String.valueOf(0)); + } if(UtilMethods.isSet(categoriesvalues)){ luceneQuery.append("+(" + categoriesvalues + ") " ); @@ -866,9 +873,8 @@ else if( fieldbcontentname.startsWith("date") ){ Contentlet con; for (int i = 0; ((i < perPage) && (i < hits.size())); ++i) { con = hits.get(i); - + Identifier ident=APILocator.getIdentifierAPI().find(con); if(!con.isLive()) { - Identifier ident=APILocator.getIdentifierAPI().find(con); if(UtilMethods.isSet(ident.getSysExpireDate()) && ident.getSysExpireDate().before(new Date())) expiredInodes.add(con.getInode()); // it is unpublished and can't be manualy published } @@ -912,12 +918,12 @@ else if( fieldbcontentname.startsWith("date") ){ : (s.getStructureType() ==2) ? "gearIcon" : (s.getStructureType() ==3) - ? "formIcon" - : "fileIcon"; - String typeStringToShow = s.getName() + " - " + s.getVelocityVarName(); - if(s.getName().trim().replace(" ", "").toLowerCase().equals(s.getVelocityVarName().toLowerCase())){ - typeStringToShow = s.getName(); - } + ? "formIcon" + : (s.getStructureType() ==4) + ? "uknIcon " + UtilMethods.getFileExtension( ident.getURI()) + "Icon" + : "pageIcon"; + + String typeStringToShow = s.getName() ; searchResult.put("__type__", "
 " + typeStringToShow +"
"); String fieldValue = UtilMethods.dateToHTMLDate(con.getModDate()) + " " + UtilMethods.dateToHTMLTime(con.getModDate()); @@ -987,7 +993,7 @@ else if( fieldbcontentname.startsWith("date") ){ searchResult.put("locked", locked.toString()); searchResult.put("structureInode", con.getStructureInode()); searchResult.put("workflowMandatory", String.valueOf(APILocator.getWorkflowAPI().findSchemeForStruct(con.getStructure()).isMandatory())); - searchResult.put("contentStructureType", ""+con.getStructure().getStructureType()); + searchResult.put("contentStructureType", "x"+con.getStructure().getStructureType()); // Workflow Actions diff --git a/src/com/dotmarketing/util/WebKeys.java b/src/com/dotmarketing/util/WebKeys.java index f3fa81bcd3e3..7b6920a48342 100644 --- a/src/com/dotmarketing/util/WebKeys.java +++ b/src/com/dotmarketing/util/WebKeys.java @@ -214,7 +214,6 @@ public final class WebKeys { public static final String HTMLPAGE_INODE = "com.dotmarketing.htmlpage.inode"; public static final String REDIRECT_PREVIEW_PAGE = "com.dotmarketing.htmlpage.redirect.preview"; public static final String HTMLPAGE_LANGUAGE = "com.dotmarketing.htmlpage.language"; - public static final String HTMLPAGE_BROWSER_LANGUAGE = "com.dotmarketing.htmlpage.browser.language"; public static final String Globals_FRONTEND_LOCALE_KEY = "com.dotmarketing.frontend.locale"; public static final String HTMLPAGE_ID = "pageId";