Page Menu
Home
In-Portal Phabricator
Search
Configure Global Search
Log In
Files
F776021
in-portal
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Subscribers
None
File Metadata
Details
File Info
Storage
Attached
Created
Thu, Feb 6, 4:35 PM
Size
11 KB
Mime Type
text/x-diff
Expires
Sat, Feb 8, 4:35 PM (1 d, 27 m)
Engine
blob
Format
Raw Data
Handle
558508
Attached To
rINP In-Portal
in-portal
View Options
Index: branches/5.0.x/core/admin_templates/login.tpl
===================================================================
--- branches/5.0.x/core/admin_templates/login.tpl (revision 13336)
+++ branches/5.0.x/core/admin_templates/login.tpl (revision 13337)
@@ -1,243 +1,242 @@
<inp2:m_Set skip_last_template="1"/>
<inp2:adm_HTTPAuth result_to_var="http_auth"/>
<inp2:m_include t="incs/header" nobody="yes"/>
<body topmargin="0" leftmargin="0" marginheight="0" marginwidth="0" bgcolor="#FFFFFF">
<style type="text/css">
<!--
html, body {
margin: 0;
padding: 0;
width: 100%;
height: 100%;
overflow: hidden;
}
#header-div {
position: absolute;
top: 0px;
height: 160px;
left: 0px;
right: 0px;
background: url('img/login/login-top.png') no-repeat right top #007bf4;
z-index: 2;
}
#body-div {
position: absolute;
top: 160px;
bottom: 160px;
width: 100%;
text-align: center;
z-index: 5;
}
#footer-div {
position: absolute;
bottom: 0px;
height: 160px;
left: 0px;
right: 0px;
background: url('img/login/login-bottom.png') no-repeat left bottom #007bf4;
z-index: 2;
}
#outer {
position: absolute;
top: 50%;
left: 0px;
width: 100%;
height: 1px;
overflow: visible;
z-index: 10;
}
#inner {
text-align: left;
width: 100%;
height: 300px;
margin-left: -50%; /*** width / 2 ***/
position: absolute;
top: -150px; /*** height / 2 ***/
left: 50%;
z-index: 5;
/* border: 1px solid #000000; */
}
#form table {
- -moz-border-radius-bottomleft:20px;
- -moz-border-radius-bottomright:20px;
- -moz-border-radius-topleft:20px;
- -moz-border-radius-topright:20px;
+ -moz-border-radius: 20px;
+ -webkit-border-radius: 20px;
border: 1px solid #CCCCCC;
font-weight: normal;
background-color: #ECECEC;
z-index: 5;
}
#form table td {
padding: 2px 15px 2px 15px;
}
.login-table {
background: #ECECEC;
}
.roundbutton {
-moz-border-radius: 11px;
+ -webkit-border-radius: 11px;
cursor: pointer;
padding: 2px 5px;
text-decoration: none;
}
-->
</style>
<div id="header-div"></div>
<div id="body-div">
<div id="outer">
<div id="inner" align="center">
<div id="logo" align="center" style="margin-bottom: 20px;">
<table class="head-table" style="background: none;">
<tr>
<inp2:m_if check="adm_AdminSkin" type="LogoLogin">
<td align="center"><img src="<inp2:adm_AdminSkin type='LogoLogin'/>" alt="<inp2:m_GetConfig var='Site_Name'/>"></td>
<inp2:m_else/>
<inp2:m_if check="adm_AdminSkin" type="Logo">
<td>
<img src="<inp2:adm_AdminSkin type='Logo'/>" alt="<inp2:m_GetConfig var='Site_Name'/>"><br/>
<inp2:m_if check="adm_AdminSkin" type="LogoBottom">
<img src="<inp2:adm_AdminSkin type='LogoBottom'/>" alt="<inp2:m_GetConfig var='Site_Name'/>">
</inp2:m_if>
</td>
</inp2:m_if>
<td align="left" valign="middle">
<span style="font-size: 48px; color: black;"><inp2:m_GetConfig var="Site_Name"/></span>
</td>
</inp2:m_if>
</tr>
</table>
</div>
<div id="form" align="center">
<inp2:m_if check="m_Param" name="http_auth">
<table class="login-table">
<tr>
<td colspan="2" style="text-align: center">
<inp2:m_if check="u.current_HasError" field="any">
<span class="error-cell"><inp2:u.current_Error field="ValidateLogin"/></span>
</inp2:m_if><br/>
</td>
</tr>
<tr>
<td class="text"><inp2:m_phrase name="la_Text_Login"/>:</td>
<td><input type="text" name="login" class="text" value="<inp2:u_CookieUsername submit_field="login"/>" style="width: 150px;"></td>
</tr>
<tr>
<td class="text"><inp2:m_phrase name="la_prompt_Password"/>:</td>
<td><input type="password" name="password" class="text" style="width: 150px;"></td>
</tr>
<tr>
<td colspan="2">
<input type="checkbox" id="save_username" name="cb_save_username"<inp2:m_if check="m_GetEquals" name="save_username" value="" inverse="inverse"> checked="checked"</inp2:m_if>/>
<label for="save_username"><inp2:m_Phrase label="la_SaveLogin"/></label>
</td>
</tr>
<tr>
<td colspan="2" align="center" style="padding: 5px 15px 10px 15px;">
<input type="submit" name="login_button" value="<inp2:m_phrase name='la_Login' no_editing='1'/>" class="kx-login-button roundbutton"></td>
</tr>
</table>
<inp2:m_else/>
<h1 style="color: red;">401 Authentication Required</h1>
</inp2:m_if>
</div>
</div>
</div>
</div>
<div id="footer-div"></div>
<inp2:m_if check="m_Param" name="http_auth">
<input type="hidden" name="events[u]" value="OnLogin"/>
<input type="hidden" name="next_template" value="<inp2:m_if check="m_GetEquals" name="next_template" value="">index<inp2:m_else/><inp2:m_get var="next_template"/></inp2:m_if>"/>
<input type="hidden" name="skip_last_template" value="1"/>
<script type="text/javascript">
$(document).ready(
function() {
$("input[name='login']").focus();
}
);
var a_parent = window.parent;
var to_close = new Array();
function redirect() {
// alert('running redirect in "' + window.name + '"');
// window.name = 'redirect';
var $main_frame = getFrame('main');
a_parent = window;
try {
var i = 0;
while (i < 10) {
i++;
var $opener = $main_frame.getWindowOpener(a_parent);
// console.log('window: ', a_parent.name, '; opener: ', $opener ? $opener.name : null);
if ($opener) {
to_close.push(a_parent);
a_parent = $opener;
continue;
}
if (a_parent.name == 'main_frame') {
break;
}
if (a_parent.parent && a_parent.parent.name != a_parent.name) {
a_parent = a_parent.parent;
continue;
}
}
}
catch (err) {
// another website is opened in parent window
alert('Error while trying to access window opener: [' + err.message + ']');
i = 10;
}
if (i < 10) {
// console.log('to close: ', to_close);
setTimeout(close_windows, 100);
}
}
function close_windows() {
page = '<inp2:m_t t="index" expired="1" escape="1" no_amp="1" m_wid=""/>'; // a_parent.location.href + '?expired=1';
// alert('redirecting ' + a_parent.name + ' to ' + page);
a_parent.location.href = page;
// alert('closing ' + to_close.length + ' windows');
for (var c = (to_close.length - 1); c >= 0; c--) {
// alert('closing ' + to_close[c].name);
window_close(to_close[c]);
}
}
if (window.top.frames.length > 0) {
redirect();
}
</script>
</inp2:m_if>
<inp2:m_include t="incs/footer"/>
\ No newline at end of file
Index: branches/5.0.x/core/admin_templates/incs/cms.css
===================================================================
--- branches/5.0.x/core/admin_templates/incs/cms.css (revision 13336)
+++ branches/5.0.x/core/admin_templates/incs/cms.css (revision 13337)
@@ -1,176 +1,178 @@
/* === Common styles for "Section Properties" and "Edit" buttons === */
div.cms-btn-image {
float: left;
height: 15px;
vertical-align: middle;
}
div.cms-btn-text {
margin-left: 3px;
float: left;
white-space: nowrap;
vertical-align: middle;
}
div.cms-btn-content {
padding: 5px;
}
div.cms-section-properties-btn, div.cms-edit-btn, div.cms-edit-block-btn, div.cms-edit-design-btn {
padding: 2px 5px;
font-family: Arial, Verdana;
font-size: 13px;
font-weight: normal;
width: auto;
position: absolute;
color: black;
cursor: pointer;
-moz-border-radius: 10px;
+ -webkit-border-radius: 10px;
z-index: 99;
}
div.cms-edit-btn, div.cms-edit-block-btn, div.cms-edit-design-btn {
margin-top: -10px;
}
div.cms-edit-design-btn-container {
position: absolute;
margin-left: -10px;
margin-top: -10px;
display: none;
}
div.cms-edit-design-btn-container div.cms-edit-block-btn, div.cms-edit-design-btn-container div.cms-edit-design-btn {
float: left;
display: block;
position: relative;
margin: 0px;
}
div.cms-edit-design-btn-container div.cms-edit-design-btn {
margin-left: 4px;
}
/* === Styles for "Section Properties" button === */
div.cms-section-properties-btn {
float: right;
position: relative;
border: 2px solid #A1D0A1;
background-color: #CCFF00;
opacity: 0.5;
filter: alpha(opacity=50);
}
div.cms-section-properties-btn-container {
border: 1px dashed #A1D0A1;
margin: 10px;
}
/* === Styles for "Edit" button === */
div.cms-edit-btn-container {
border: 1px dashed #FF6E00;
}
div.cms-edit-btn {
margin-left: -10px;
border: 2px solid #FF6E00;
background-color: #FFCC00;
opacity: 0.5;
filter: alpha(opacity=50);
}
div.cms-edit-block-btn {
margin-left: -10px;
border: 2px solid #FF6E00;
background-color: #FFCC00;
display: none;
}
div.cms-edit-design-btn {
margin-left: -10px;
border: 2px solid #A1D0A1;
background-color: #CCFF00;
display: none;
}
/* === Styles for "Save" and "Cancel" buttons (for layout) === */
div.cms-layout-btn-container {
position: absolute;
display: none;
z-index: 99;
}
div.cms-save-layout-btn, div.cms-cancel-layout-btn {
float: left;
padding: 2px 5px;
font-family: Arial, Verdana;
font-size: 13px;
font-weight: normal;
width: auto;
color: black;
cursor: pointer;
/*opacity: 0.5;
filter: alpha(opacity=50);*/
-moz-border-radius: 10px;
+ -webkit-border-radius: 10px;
}
div.cms-save-layout-btn {
color: white;
border: 2px solid #1C960C;
background-color: #24B30D;
}
div.cms-cancel-layout-btn {
color: white;
border: 2px solid #C81900;
background-color: #DE2A00;
}
div.cms-cancel-layout-btn {
margin-left: 4px;
}
/* === Styles for Template Editor === */
div.block-edit-block-btn-container, div.block-edit-design-btn-container {
border: 1px dashed transparent;
}
div.block-edit-block-btn-container-over, div.block-edit-design-btn-container-over {
border-color: #FF6E00;
}
/*div.block-edit-design-btn-container-over {
border-color: #A1D0A1;
}*/
/* === Styles for element moving/sorting in theme === */
div.movable-area {
min-height: 200px;
}
.move-helper {
border: 3px dashed #666;
/*width: auto !important;*/
}
/* === Styles for phrase translation links === */
span[name='cms-translate-phrase'] {
text-decoration: none;
border: 1px dashed transparent;
padding: 3px;
}
span[name='cms-translate-phrase']:hover {
border-color: #FF6E00;
}
span[name='cms-translate-phrase'] .cms-btn-text {
font-size: 9px;
}
span[name='cms-translate-phrase'] .cms-edit-btn {
display: none;
opacity: 1;
filter: alpha(opacity=100);
}
\ No newline at end of file
Event Timeline
Log In to Comment