Skip to content

Commit

Permalink
upgrade css sorted
Browse files Browse the repository at this point in the history
  • Loading branch information
danielkerr committed Jan 31, 2015
1 parent c17506c commit f4207b0
Show file tree
Hide file tree
Showing 2 changed files with 54 additions and 54 deletions.
38 changes: 18 additions & 20 deletions upload/install/view/template/success.tpl
Original file line number Diff line number Diff line change
@@ -1,27 +1,25 @@
<?php echo $header; ?>
<div class="container">
<header>
<div class="row">
<div class="col-sm-6">
<div class="pull-right hidden-xs"> <img src="view/image/logo.png" alt="OpenCart" title="OpenCart" /></div>
</div>
</div>
</header>
<div class="row">
<h1>Upgrade - Complete!</h1>
<div class="row">
<div class="col-sm-9">
<div class="alert alert-danger">Don't forget to delete your installation directory!</div>
<p>Congratulations! You have successfully upgraded OpenCart.</p>
<header>
<div class="row">
<div class="col-lg-6"><a href="../"><img src="view/image/screenshot_1.png" alt="" /></a><br />
<a href="../">Goto your Online Shop</a></div>
<div class="col-lg-6"><a href="../admin/"><img src="view/image/screenshot_2.png" alt="" /></a><br />
<a href="../admin/">Login to your Administration</a></div>
<div class="col-sm-12"><img src="view/image/logo.png" alt="OpenCart" title="OpenCart" /></div>
</div>
</div>
<div class="col-sm-3">
<div>
</header>
<h1>Upgrade - Complete!</h1>
<div class="row">
<div class="col-sm-9">
<div class="alert alert-danger">Don't forget to delete your installation directory!</div>
<p>Congratulations! You have successfully upgraded OpenCart.</p>
<div class="row">
<div class="col-lg-6"><a href="../"><img src="view/image/screenshot_1.png" alt="" class="img-thumbnail" /></a><br />
<p class="text-center"><a href="../">Goto your Online Shop</a></p>
</div>
<div class="col-lg-6"><a href="../admin/"><img src="view/image/screenshot_2.png" alt="" class="img-thumbnail" /></a><br />
<p class="text-center"><a href="../admin/">Login to your Administration</a></p>
</div>
</div>
</div>
<div class="col-sm-3">
<ul class="list-group">
<li class="list-group-item">Upgrade</li>
<li class="list-group-item"><b>Finished</b></li>
Expand Down
70 changes: 36 additions & 34 deletions upload/install/view/template/upgrade.tpl
Original file line number Diff line number Diff line change
@@ -1,41 +1,43 @@
<?php echo $header; ?>
<header>
<div class="container">
<div id="logo"><img src="view/image/logo.png" alt="OpenCart" title="OpenCart" /></div>
</div>
</header>
<div class="container">
<h1>Upgrade</h1>
<div id="column-right">
<ul>
<li><b>Upgrade</b></li>
<li>Finished</li>
</ul>
</div>
<div id="content">
<?php if ($error_warning) { ?>
<div class="alert alert-danger"><i class="fa fa-exclamation-circle"></i> <?php echo $error_warning; ?>
<button type="button" class="close" data-dismiss="alert">&times;</button>
<header>
<div class="row">
<div class="col-sm-12"><img src="view/image/logo.png" alt="OpenCart" title="OpenCart" /></div>
</div>
<?php } ?>
<form action="<?php echo $action; ?>" method="post" enctype="multipart/form-data">
<fieldset>
<p><b>Follow these steps carefully!</b></p>
<ol>
<li>Post any upgrade script errors problems in the forums</li>
<li>After upgrade, clear any cookies in your browser to avoid getting token errors.</li>
<li>Load the admin page & press Ctrl+F5 twice to force the browser to update the css changes.</li>
<li>Goto Admin -> Users -> User Groups and Edit the Top Adminstrator group. Check All boxes.</li>
<li>Goto Admin and Edit the main System Settings. Update all fields and click save, even if nothing changed.</li>
<li>Load the store front & press Ctrl+F5 twice to force the browser to update the css changes.</li>
</ol>
</fieldset>
<div class="buttons">
<div class="right">
<input type="submit" value="Continue" class="button" />
</div>
</header>
<h1>Upgrade</h1>
<div class="row">
<div class="col-sm-9">
<?php if ($error_warning) { ?>
<div class="alert alert-danger"><i class="fa fa-exclamation-circle"></i> <?php echo $error_warning; ?>
<button type="button" class="close" data-dismiss="alert">&times;</button>
</div>
</form>
<?php } ?>
<form action="<?php echo $action; ?>" method="post" enctype="multipart/form-data">
<fieldset>
<p><b>Follow these steps carefully!</b></p>
<ol>
<li>Post any upgrade script errors problems in the forums</li>
<li>After upgrade, clear any cookies in your browser to avoid getting token errors.</li>
<li>Load the admin page & press Ctrl+F5 twice to force the browser to update the css changes.</li>
<li>Goto Admin -> Users -> User Groups and Edit the Top Adminstrator group. Check All boxes.</li>
<li>Goto Admin and Edit the main System Settings. Update all fields and click save, even if nothing changed.</li>
<li>Load the store front & press Ctrl+F5 twice to force the browser to update the css changes.</li>
</ol>
</fieldset>
<div class="buttons">
<div class="text-right">
<input type="submit" value="Continue" class="button" />
</div>
</div>
</form>
</div>
<div class="col-sm-3">
<ul class="list-group">
<li class="list-group-item"><b>Upgrade</b></li>
<li class="list-group-item">Finished</li>
</ul>
</div>
</div>
</div>
<?php echo $footer; ?>

1 comment on commit f4207b0

@osworx
Copy link
Contributor

@osworx osworx commented on f4207b0 Feb 1, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It would be useful to have NOT any hard-coded language strings inside!
Otherwise no translations are possible.

Please sign in to comment.