Skip to content

Commit

Permalink
Apereo Branding
Browse files Browse the repository at this point in the history
  • Loading branch information
@juliantenney
juliantenney committed Apr 27, 2015
1 parent c0b5925 commit 65e6c4d
Show file tree
Hide file tree
Showing 10 changed files with 12 additions and 12 deletions.
4 changes: 2 additions & 2 deletions extend.php
View file
Expand Up @@ -225,10 +225,10 @@ function mgt_page($xerte_toolkits_site, $extra)
-->
<div class="topbar">
<div style="width:50%; height:100%; float:right; position:relative; background-image:url(http://www.nottingham.ac.uk/toolkits/website_code/images/UofNLogo.jpg); background-repeat:no-repeat; background-position:right; margin-right:10px; float:right">
<div style="width:50%; height:100%; float:right; position:relative; background-image:url(website_code/images/apereoLogo.png); background-repeat:no-repeat; background-position:right; margin-right:10px; float:right">
<p style="float:right; margin:0px; color:#a01a13;"><button type="button" class="xerte_button" onclick="javascript:logout()" ><?PHP echo EXTEND_LOGOUT; ?></button></p>
</div>
<img src="website_code/images/xerteLogo.jpg" style="margin-left:10px; float:left" />
<img src="website_code/images/logo.png" style="margin-left:10px; float:left" />
</div>

<!--
Expand Down
4 changes: 2 additions & 2 deletions feedback/index.php
View file
Expand Up @@ -53,8 +53,8 @@
<body>

<div class="topbar">
<img src="<?php echo $edit_site_logo;?>" style="margin-left:10px; float:left" />
<img src="<?php echo $edit_organisational_logo;?>" style="margin-right:10px; float:right" />
<img src="website_code/images/logo.png" style="margin-left:10px; float:left" />
<img src="website_code/images/apereoLogo.png" style="margin-right:10px; float:right" />
</div>
<div class="mainbody"><?PHP

Expand Down
4 changes: 2 additions & 2 deletions index.php
View file
Expand Up @@ -148,9 +148,9 @@
<div class="content" id="mainHeader">
<div class="topbar">
<div
style="width:50%; height:100%; float:right; position:relative; background-image:url(<?php echo $xerte_toolkits_site->site_url . $xerte_toolkits_site->organisational_logo ?>); background-repeat:no-repeat; background-position:right; margin-right:10px; float:right">
style="width:50%; height:100%; float:right; position:relative; background-image:url(website_code/images/apereoLogo.png); background-repeat:no-repeat; background-position:right; margin-right:10px; float:right">
</div>
<img src="<?php echo $xerte_toolkits_site->site_logo; ?>" style="margin-left:10px; float:left"/>
<img src="website_code/images/logo.png" style="margin-left:10px; float:left"/>
</div>
<div class="userbar">
<div style="float:left;"><?php display_language_selectionform("general"); ?></div>
Expand Down
4 changes: 2 additions & 2 deletions management.php
View file
Expand Up @@ -68,8 +68,8 @@ function mgt_page($xerte_toolkits_site, $extra)
<body>

<div class="topbar">
<img src="<?PHP echo $xerte_toolkits_site->site_logo; ?>" style="margin-left:10px; float:left" />
<img src="<?PHP echo $xerte_toolkits_site->organisational_logo; ?>" style="margin-right:10px; float:right" />
<img src="website_code/images/logo.png" style="margin-left:10px; float:left" />
<img src="website_code/images/apereoLogo.png" style="margin-right:10px; float:right" />
</div>


Expand Down
4 changes: 2 additions & 2 deletions setup/page_top
View file
Expand Up @@ -64,8 +64,8 @@ p{
<body>

<div class="topbar">
<img src="../website_code/images/xerteLogo.jpg" style="margin-left:10px; float:left" />
<img src="../website_code/images/UofNLogo.jpg" style="margin-right:10px; float:right" />
<img src="../website_code/images/logo.png" style="margin-left:10px; float:left" />
<img src="../website_code/images/apereoLogo.png" style="margin-right:10px; float:right" />
</div>

<div class="pagecontainer">
Expand Down
Binary file removed website_code/images/UofNLogo.jpg
View file
Binary file not shown.
Binary file added website_code/images/apereoLogo.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added website_code/images/logo.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed website_code/images/xerteLogo.jpg
View file
Binary file not shown.
4 changes: 2 additions & 2 deletions website_code/php/login_library.php
View file
Expand Up @@ -136,12 +136,12 @@ function html_headers() {
END;

echo '<div class="topbar">';
echo '<div style="width:50%; height:100%; float:right; position:relative; background-image:url(' . $xerte_toolkits_site->organisational_logo . '); background-repeat:no-repeat; background-position:right; margin-right:10px; float:right">';
echo '<div style="width:50%; height:100%; float:right; position:relative; background-image:url(website_code/images/apereoLogo.png); background-repeat:no-repeat; background-position:right; margin-right:10px; float:right">';
echo ' <p style="float:right; margin:0px; color:#a01a13;"><a href="javascript:logout()" style="color:#a01a13">';
// echo INDEX_LOG_OUT;
echo ' </a></p>';
echo ' </div>';
echo ' <img src="' . $xerte_toolkits_site->site_logo . '" style="margin-left:10px; float:left" />';
echo ' <img src="website_code/images/logo.png" style="margin-left:10px; float:left" />';
echo '</div>';
print <<<END
Expand Down

0 comments on commit 65e6c4d

Please sign in to comment.