Skip to content

Issue 7214 ccs styling issues #7239

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jtesser merged 6 commits into from
Feb 12, 2015
Merged

Issue 7214 ccs styling issues #7239

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7d93596
#7214 fixed icons, moved language bar
wezell Feb 10, 2015
8127090
#7214 fixed icons more
wezell Feb 10, 2015
d19de5d
remove old index.jsp
wezell Feb 10, 2015
3a58b5a
#7214 fixed page reload
wezell Feb 11, 2015
9f99ead
#7214 fixed page reload
wezell Feb 11, 2015
9e36220
#7214 make browser and content search respect the same session variab…
wezell Feb 11, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions dotCMS/WEB-INF/velocity/preview_mode.vl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=")))
<html>
<head>
<!-- meta http-equiv="refresh" content="0; url=${_baseURI}#if($UtilMethods.isSet($queryString))?${queryString}#end"-->
<script>
window.top.location.replace("${_baseURI}#if($UtilMethods.isSet($queryString))?${queryString}#end");
</script>
Expand Down
90 changes: 43 additions & 47 deletions dotCMS/html/portlet/ext/browser/view_browser.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<Language> languages = (List<Language>)request.getAttribute (com.dotmarketing.util.WebKeys.LANGUAGES);

%>

<div id="messagesTable" style="display: none;">
<span class="exclamation"></span>
Expand All @@ -31,7 +42,7 @@
<script src="/dwr/interface/BrowserAjax.js" type="text/javascript"></script>
<script src="/dwr/interface/StructureAjax.js" type="text/javascript"></script>

<% com.dotmarketing.beans.Host myHost = WebAPILocator.getHostWebAPI().getCurrentHost(request); %>


<%@ include file="/html/portlet/ext/browser/view_browser_js_inc.jsp"%>
<%@ include file="/html/portlet/ext/browser/view_browser_menus_js_inc.jsp"%>
Expand Down Expand Up @@ -72,7 +83,27 @@
});

dojo.require("dojox.form.uploader.plugins.Flash");

var counter=0;

function doSearch() {

var selectedFolder = document.getElementsByClassName("folderSelected")[0];
var lang = dijit.byId("language_id").get('value');

if(selectedFolder) {
var folderId = selectedFolder.id;
folderId = folderId.split("-TreeREF")[0];
treeFolderSelected(folderId, lang);
} else if(counter>0) {
var hostId = '<%= (myHost != null) ? myHost.getIdentifier() : "" %>';
treeFolderSelected(hostId, lang);
}

selectedLang = lang;

counter++;

}
</script>

<div id="addNewDropDownButtonDiv" class="buttonBoxRightTopPadding">
Expand All @@ -82,51 +113,13 @@
<b><%= LanguageUtil.get(pageContext, "Sites-and-Folders") %></b>
</div>

<%
Language defaultLang = APILocator.getLanguageAPI().getDefaultLanguage();
String languageId = String.valueOf(defaultLang.getId());

if(request.getSession().getAttribute(com.dotmarketing.util.WebKeys.HTMLPAGE_BROWSER_LANGUAGE)!= null){
languageId = (String) request.getSession().getAttribute(com.dotmarketing.util.WebKeys.HTMLPAGE_BROWSER_LANGUAGE);
}
List<Language> languages = (List<Language>)request.getAttribute (com.dotmarketing.util.WebKeys.LANGUAGES);

if(UtilMethods.isSet(languages) && languages.size()>1) {
%>
<script>
multipleLanguages = true;
</script>
<div id="combo_zone2" class="buttonBoxRightTopPadding" style="margin-right:120px;">
<input id="language_id" />
</div>
<%@include file="../contentlet/languages_select_inc.jsp" %>

<% } %>

<script>
<%if(UtilMethods.isSet(languages) && languages.size()>1) {%>
<script>
multipleLanguages = true;
</script>

var counter=0;
<%}%>

function doSearch() {

var selectedFolder = document.getElementsByClassName("folderSelected")[0];
var lang = dijit.byId("language_id").get('value');

if(selectedFolder) {
var folderId = selectedFolder.id;
folderId = folderId.split("-TreeREF")[0];
treeFolderSelected(folderId, lang);
} else if(counter>0) {
var hostId = '<%= (myHost != null) ? myHost.getIdentifier() : "" %>';
treeFolderSelected(hostId, lang);
}

selectedLang = lang;

counter++;

}
</script>



Expand All @@ -142,8 +135,11 @@ function doSearch() {

</div>

<div dojoType="dijit.layout.ContentPane" splitter="true" style="margin-top:35px;" region="center" class="rightContentPane" id="rightContentPane">

<div dojoType="dijit.layout.ContentPane" splitter="true" style="margin:6px 0px 43px 6px" region="center" class="rightContentPane" id="rightContentPane">
<div id="combo_zone2" >
<input id="language_id" />
</div>
<%@include file="../contentlet/languages_select_inc.jsp" %>

<table class="browserTable" id="assetListBodyTD">
<thead id="assetListHead">
Expand Down
16 changes: 14 additions & 2 deletions dotCMS/html/portlet/ext/browser/view_browser_js_inc.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"%>
Expand All @@ -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);
}


%>
<script type="text/javascript" src="/dwr/interface/HostAjax.js"></script>

Expand Down Expand Up @@ -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();
Expand Down Expand Up @@ -864,7 +876,7 @@ dojo.require("dotcms.dojo.push.PushHandler");
var modUserName = shortenString(asset.modUserName, 20);
var languageHTML = (asset.type=='htmlpage' && asset.isContentlet && multipleLanguages)
?"<img src=\"/html/images/languages/"+asset.languageCode+ "_" +asset.countryCode +
".gif\" width=\"16px\" height=\"11px\" /><span id='"+asset.inode+"-LangSPAN'>&nbsp;("+asset.languageCode+ "_" +asset.countryCode+")</span>":"";
".gif\" width=\"16px\" height=\"11px\" style='margin-top:4px;float:left;' /><span id='"+asset.inode+"-LangSPAN'>&nbsp;("+asset.languageCode+ "_" +asset.countryCode+")</span>":"";

var html = '<tr id="' + asset.inode + '-TR">\n' +
' <td class="nameTD" id="' + asset.inode + '-NameTD">' +
Expand Down
20 changes: 8 additions & 12 deletions dotCMS/html/portlet/ext/contentlet/view_contentlets.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"))){
Expand Down Expand Up @@ -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)){
Expand Down Expand Up @@ -227,7 +221,9 @@
? "gearIcon"
: (s.getStructureType() ==3)
? "formIcon"
: "fileIcon";
: (s.getStructureType() ==4)
? "fileIcon"
: "pageIcon";



Expand Down
17 changes: 11 additions & 6 deletions dotCMS/html/portlet/ext/contentlet/view_contentlets_js_inc.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1692,21 +1692,26 @@
if(dijit.byId("checkAll")){
dijit.byId("checkAll").destroy();
}
th.setAttribute("valign","bottom");
th.setAttribute("nowrap","true");
th.innerHTML = '<input type="checkbox" dojoType="dijit.form.CheckBox" name="checkAll" id="checkAll" onclick="checkUncheckAll()">&nbsp;&nbsp;' + 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 = "<a href=\"javascript: doSearch (1, 'modUser')\"><%= LanguageUtil.get(pageContext, "Last-Editor") %></a>";
row.appendChild(th);

th = document.createElement('th');
th.setAttribute("style","text-align:center;");
th.setAttribute("valign","bottom");
th.style.width="120px";
th.innerHTML = "<a class=\"beta\" href=\"javascript: doSearch (1, 'modDate')\"><%= LanguageUtil.get(pageContext, "Last-Edit-Date") %></a>";
row.appendChild(th);

Expand Down Expand Up @@ -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 = "<img src=\"/html/images/languages/" + languages[n][1] + "_" + languages[n][2] + ".gif\" width=\"16px\" height=\"11px\" />&nbsp;(" + languages[n][1] + "_" + languages[n][2] + ")";
//locale = languages[n][1] + "_" + languages[n][2];
locale = "<img style='margin-top: 3px;' src='/html/images/languages/" + languages[n][1] + "_" + languages[n][2] + ".gif' width='16px' height='11px' />&nbsp;(" + languages[n][1] + "_" + languages[n][2] + ")";
break;
}
}
Expand All @@ -1766,6 +1771,7 @@

cell.innerHTML = locale;
var cell = row.insertCell (row.cells.length);

var value = titleCell(cellData,cellData[header["fieldVelocityVarName"]], i);

} else {
Expand All @@ -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";
Expand Down
Loading