Skip to content

Commit

Permalink
Fix views using old design elements, closes #1279
Browse files Browse the repository at this point in the history 
Bringing install (and install error) pages in line with the 1.0 design CSS.

Signed-off-by: Anil Dash <anil@dashes.com>

closes #1289
  • Loading branch information
@anildash @ginatrapani
anildash authored and ginatrapani committed Mar 22, 2012
1 parent fff2b0e commit a632620
Show file tree
Hide file tree
Showing 5 changed files with 40 additions and 79 deletions.
2 changes: 1 addition & 1 deletion webapp/_lib/view/500-perm.html
View file
Expand Up @@ -51,7 +51,7 @@ <h1><span id="headerthink">Think</span><span id="headerup">Up</span></h1>
<!-- end .container -->
<div class="container_24 thinkup-canvas clearfix">
<div class="grid_22 prefix_1 alpha omega prepend_20 append_20 clearfix">
<div class="ui-state-error ui-corner-all"
<div class="alert urgent"
style="margin: 20px 0px; padding: 0.5em 0.7em;">
<p><span class="ui-icon ui-icon-alert"
style="float: left; margin: .3em 0.3em 0 0;"></span> <b>Oops!</b> ThinkUp is unable
Expand Down
47 changes: 35 additions & 12 deletions webapp/_lib/view/_install.header.tpl
View file
@@ -1,11 +1,13 @@
<!DOCTYPE html>

<html lang="en">

<html lang="en" itemscope itemtype="http://schema.org/Article">
<head>
<meta charset="utf-8">
<title>{if $controller_title}{$controller_title} | {/if}{$app_title}</title>
<link rel="shortcut icon" type="image/x-icon" href="{$site_root_path}assets/img/favicon.png">
<link type="text/css" rel="stylesheet" href="{$site_root_path}assets/css/base.css">
<link type="text/css" rel="stylesheet" href="{$site_root_path}assets/css/positioning.css">
<link type="text/css" rel="stylesheet" href="{$site_root_path}assets/css/style.css">
<link type="text/css" rel="stylesheet" href="{$site_root_path}assets/css/installer.css">

<!-- jquery -->
<link type="text/css" rel="stylesheet" href="{$site_root_path}assets/css/jquery-ui-1.8.13.css">
Expand Down Expand Up @@ -52,15 +54,36 @@


<!-- custom css -->
<link type="text/css" rel="stylesheet" href="{$site_root_path}assets/css/base.css">
<link type="text/css" rel="stylesheet" href="{$site_root_path}assets/css/positioning.css">
<link type="text/css" rel="stylesheet" href="{$site_root_path}assets/css/style.css">
<link type="text/css" rel="stylesheet" href="{$site_root_path}assets/css/installer.css">
</head>
<body>
<div class="container clearfix">


<div id="status-bar" class="clearfix">

<div class="status-bar-left">

</div> <!-- .status-bar-left -->

<div class="status-bar-right text-right">
<ul>
{if $logged_in_user}
<li>Logged in as{if $user_is_admin} admin{/if}: {$logged_in_user} {if $user_is_admin}<script src="{$site_root_path}install/checkversion.php"></script>{/if}<a href="{$site_root_path}account/?m=manage" class="linkbutton">Settings</a> <a href="{$site_root_path}session/logout.php" class="linkbutton">Log Out</a></li>
{else}

<li><a href="http://thinkupapp.com/" class="linkbutton">Get ThinkUp</a> <a href="{$site_root_path}session/login.php" class="linkbutton" >Log In</a></li>
{/if}
</ul>
</div> <!-- .status-bar-right -->


</div> <!-- #status-bar -->

<div id="page-bkgd">

<div class="container clearfix">

<div id="app-title"><a href="{$site_root_path}{$logo_link}">
<h1><span id="headerthink">Think</span><span id="headerup">Up</span></h1>
</a></div> <!-- end #app-title -->

<div id="app-title">
<h1><span id="headerthink">Think</span><span id="headerup">Up</span></h1>
</div>
</div>
</div> <!-- end .container -->
2 changes: 1 addition & 1 deletion webapp/_lib/view/_plugin.admin-request.tpl
View file
@@ -1,4 +1,4 @@
<div class="ui-state-error ui-corner-all" style="margin: 20px 0px; padding: 0.5em 0.7em;">
<div class="alert urgent" style="margin: 20px 0px; padding: 0.5em 0.7em;">
<p>
<span class="ui-icon ui-icon-alert" style="float: left; margin:.3em 0.3em 0 0;"></span>
This plugin's setup isn't complete. Contact your ThinkUp administrator to use this plugin.
Expand Down
2 changes: 1 addition & 1 deletion webapp/_lib/view/install.step1.tpl
View file
Expand Up @@ -46,7 +46,7 @@
</div>
</div>
{else}
<div class="ui-state-error ui-corner-all" style="margin-bottom: 20px; padding: 0.5em 0.7em;">
<div class="alert urgent" style="margin-bottom: 20px; padding: 0.5em 0.7em;">
<p>
<span class="ui-icon ui-icon-alert" style="float: left; margin:.3em 0.3em 0 0;"></span>
<strong>Oops!</strong> Your web server isn't set up to run ThinkUp. Please fix the problems below and try installation again.
Expand Down
66 changes: 2 additions & 64 deletions webapp/_lib/view/install.upgradeneeded.tpl
View file
@@ -1,60 +1,5 @@
<!DOCTYPE html>
{include file="_install.header.tpl"}

<html lang="en">

<head>
<meta charset="utf-8">
<title>ThinkUp: Upgrading</title>
<link rel="shortcut icon" type="image/x-icon"
href="/assets/img/favicon.png">
<!-- jquery -->
<link type="text/css" rel="stylesheet"
href="//ajax.googleapis.com/ajax/libs/jqueryui/1.8/themes/base/jquery-ui.css">
<script type="text/javascript"
src="//ajax.googleapis.com/ajax/libs/jquery/1.4/jquery.min.js"></script>
<script type="text/javascript"
src="//ajax.googleapis.com/ajax/libs/jqueryui/1.8/jquery-ui.min.js"></script>
<!-- custom css -->
<link type="text/css" rel="stylesheet"
href="{$site_root_path}assets/css/base.css">
<link type="text/css" rel="stylesheet"
href="{$site_root_path}assets/css/positioning.css">
<link type="text/css" rel="stylesheet"
href="{$site_root_path}assets/css/style.css">
<link type="text/css" rel="stylesheet"
href="{$site_root_path}assets/css/installer.css">
</head>

<body>

<div id="status-bar" class="clearfix">

<div class="status-bar-left"><!-- the user has not selected an instance -->
</div>
<!-- end .status-bar-left -->

<div class="status-bar-right">
<ul>
<li>&nbsp;</li>
</ul>
</div>
<!-- end .status-bar-right --></div>
<!-- end #status-bar -->

<div class="container clearfix">

<div id="app-title"><a href="{$site_root_path}index.php">
<h1><span class="bold">Think</span><span class="gray">Up</span></h1>
<h2>New ideas</h2>
</a></div>
<!-- end #app-title -->

<div id="menu-bar">
<ul>
<li class="round-tr round-br round-tl round-bl"><a
href="http://thinkupapp.com/">Get ThinkUp</a></li>
</ul>
</div>
<!-- end #menu-bar --></div>
<!-- end .container -->
<div class="container_24 thinkup-canvas clearfix">
Expand Down Expand Up @@ -85,11 +30,4 @@ upgrade token</a>, you can enter it here:
</div>
</div>

<div class="container small center">

<!-- #ft --></div>
<!-- .content -->

</body>

</html>
{include file="_install.footer.tpl"}

0 comments on commit a632620

Please sign in to comment.