Skip to content

Commit

Permalink
Updated markup to work with BS3 RC2 changes.
Browse files Browse the repository at this point in the history
  • Loading branch information
@cjsaylor
cjsaylor committed Aug 15, 2013
1 parent 9523e12 commit decca21
Show file tree
Hide file tree
Showing 14 changed files with 149 additions and 92 deletions.
42 changes: 27 additions & 15 deletions app/View/Containers/dashboard.ctp
View file
Original file line number Diff line number Diff line change
@@ -1,23 +1,35 @@
<div class="row">
<div class="col-lg-3 panel panel-primary">
<div class="panel-heading"><?php echo __('Locations'); ?></div>
<h2 style="text-align: center"><?php echo number_format($total_locations); ?> / &infin;</h2>
<div class="progress">
<div class="progress-bar" style="width: 0%;"></div>
<div class="col-lg-4">
<div class="panel panel-primary">
<div class="panel-heading"><?php echo __('Locations'); ?></div>
<div class="panel-body">
<h2 style="text-align: center"><?php echo number_format($total_locations); ?> / &infin;</h2>
<div class="progress">
<div class="progress-bar" style="width: 0%;"></div>
</div>
</div>
</div>
</div>
<div class="col-lg-3 col-offset-1 panel panel-primary">
<div class="panel-heading"><?php echo __('Containers'); ?></div>
<h2 style="text-align: center"><?php echo number_format($total_containers); ?> / &infin;</h2>
<div class="progress">
<div class="progress-bar" style="width: 0%;"></div>
<div class="col-lg-4">
<div class="panel panel-primary">
<div class="panel-heading"><?php echo __('Containers'); ?></div>
<div class="panel-body">
<h2 style="text-align: center"><?php echo number_format($total_containers); ?> / &infin;</h2>
<div class="progress">
<div class="progress-bar" style="width: 0%;"></div>
</div>
</div>
</div>
</div>
<div class="col-lg-3 col-offset-1 panel panel-primary">
<div class="panel-heading"><?php echo __('Items'); ?></div>
<h2 style="text-align: center"><span class="stat-value"><?php echo number_format($total_container_items); ?> / &infin;</h2>
<div class="progress">
<div class="progress-bar" style="width: 0%;"></div>
<div class="col-lg-4">
<div class="panel panel-primary">
<div class="panel-heading"><?php echo __('Items'); ?></div>
<div class="panel-body">
<h2 style="text-align: center"><span class="stat-value"><?php echo number_format($total_container_items); ?> / &infin;</h2>
<div class="progress">
<div class="progress-bar" style="width: 0%;"></div>
</div>
</div>
</div>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion app/View/Elements/app/account.ctp
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<ul class="nav navbar-nav pull-right">
<ul class="nav navbar-nav navbar-right">
<li>
<div class="btn-group">
<button type="button" class="btn btn-primary dropdown-toggle navbar-btn" data-toggle="dropdown">
Expand Down
7 changes: 6 additions & 1 deletion app/View/Elements/app/submenus/Searches.find.ctp
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,7 @@
<div class="row">
<div class="btn-group">
<?php
echo $this->Html->link(__('List All Items'), array('controller' => 'container_items', 'action' => 'index'), array('class' => 'btn primary'));
echo $this->Html->link(__('List All Items'), array('controller' => 'container_items', 'action' => 'index'), array('class' => 'btn btn-primary'));
?>
</div>
</div>
7 changes: 3 additions & 4 deletions app/View/Elements/nav.ctp
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
<form action="/login" class="navbar-form pull-right" style="margin-left: 20px;">
<form action="/login" class="navbar-form navbar-right" style="margin-left: 20px;">
<button type="submit" class="btn btn-primary"><?php echo __('Login') ?></button>
</form>
<?php
echo $this->Form->create('Language', array('id' => 'change-language', 'url' => array('controller' => 'users', 'action' => 'change_language'), 'class' => 'navbar-form pull-right'));
echo $this->Form->create('Language', array('id' => 'change-language', 'url' => array('controller' => 'users', 'action' => 'change_language'), 'class' => 'navbar-form navbar-right'));
echo $this->Form->input('locale', array('id' => 'change-language-locale', 'label' => false, 'div' => false, 'class' => 'form-control', 'options' => $availableLanguages, 'empty' => __('Choose Language'), 'style' => 'width: 200px;'));
echo $this->Form->end();
?>
<ul class="nav navbar-nav pull-right">
<li style="border-right: 1px">&nbsp;</li>
<ul class="nav navbar-nav navbar-right">
<li><?php echo $this->Html->link(__('Blog'), 'http://blog.boxmeupapp.com'); ?></li>
</ul>
30 changes: 11 additions & 19 deletions app/View/Layouts/app.ctp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</title>
<?php
echo $this->Html->meta('icon');
echo $this->Html->css('//netdna.bootstrapcdn.com/bootstrap/3.0.0-rc1/css/bootstrap.min.css');
echo $this->Html->css('//netdna.bootstrapcdn.com/bootstrap/3.0.0-rc2/css/bootstrap.min.css');
echo $this->Html->css('//netdna.bootstrapcdn.com/font-awesome/3.2.1/css/font-awesome.css');
echo $this->Html->css('//ajax.googleapis.com/ajax/libs/jqueryui/1.10.3/themes/smoothness/jquery-ui.css');
echo $this->Html->css('app');
Expand All @@ -36,11 +36,13 @@

<div class="navbar navbar-fixed-top">
<div class="container">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-responsive-collapse">
<i class="icon-list"></i>
</button>
<a href="/" class="navbar-brand">Boxmeup</a>
<div class="nav-collapse collapse navbar-responsive-collapse">
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-responsive-collapse">
<i class="icon-list"></i>
</button>
<a href="/" class="navbar-brand">Boxmeup</a>
</div>
<div class="navbar-collapse collapse navbar-responsive-collapse">
<?php echo $this->element('app/account'); ?>
</div>
</div>
Expand All @@ -64,26 +66,16 @@
</div>
</div>
</div>
<div class="modal fade" id="layout-modal">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-body">
<p>Loading content...</p>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
</div>
</div><!-- /.modal-content -->
</div><!-- /.modal-dialog -->
</div><!-- /.modal -->
<div class="modal fade" id="layout-modal" data-role="dialog"></div>
<?php
if(Configure::read('Feature.beta')) {
echo $this->Html->tag('div', '', array('class' => 'beta'));
}
echo $this->element('app/footer');
echo $this->Html->script('//ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js');
echo $this->Html->script('//ajax.googleapis.com/ajax/libs/jqueryui/1.10.3/jquery-ui.min.js');
echo $this->Html->script('//netdna.bootstrapcdn.com/bootstrap/3.0.0-rc1/js/bootstrap.min.js');
echo $this->Html->script('//cdnjs.cloudflare.com/ajax/libs/underscore.js/1.5.1/underscore-min.js');
echo $this->Html->script('//netdna.bootstrapcdn.com/bootstrap/3.0.0-rc2/js/bootstrap.min.js');
echo $this->Html->script('main');
echo $this->Html->script('app');
echo $this->element('analytics');
Expand Down
30 changes: 11 additions & 19 deletions app/View/Layouts/default.ctp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</title>
<?php
echo $this->Html->meta('icon');
echo $this->Html->css('//netdna.bootstrapcdn.com/bootstrap/3.0.0-rc1/css/bootstrap.min.css');
echo $this->Html->css('//netdna.bootstrapcdn.com/bootstrap/3.0.0-rc2/css/bootstrap.min.css');
echo $this->Html->css('//netdna.bootstrapcdn.com/font-awesome/3.2.1/css/font-awesome.css');
echo $this->Html->css('main');
if (Configure::read('Feature.feedback')) {
Expand All @@ -23,11 +23,13 @@

<div class="navbar navbar-static-top">
<div class="container">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-responsive-collapse">
<i class="icon-list"></i>
</button>
<?php echo $this->Html->link('Boxmeup', '/', array('class' => 'navbar-brand')); ?>
<div class="nav-collapse collapse navbar-responsive-collapse">
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-responsive-collapse">
<i class="icon-list"></i>
</button>
<?php echo $this->Html->link('Boxmeup', '/', array('class' => 'navbar-brand')); ?>
</div>
<div class="navbar-collapse collapse navbar-responsive-collapse">
<?php echo $this->element('nav'); ?>
</div>
</div>
Expand All @@ -42,7 +44,8 @@
<?php echo $this->element('footer'); ?>
<?php
echo $this->Html->script('//ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js');
echo $this->Html->script('//netdna.bootstrapcdn.com/bootstrap/3.0.0-rc1/js/bootstrap.min.js');
echo $this->Html->script('//netdna.bootstrapcdn.com/bootstrap/3.0.0-rc2/js/bootstrap.min.js');
echo $this->Html->script('//cdnjs.cloudflare.com/ajax/libs/underscore.js/1.5.1/underscore-min.js');
echo $this->Html->scriptBlock("
var WEBROOT = '$Webroot';
");
Expand All @@ -56,17 +59,6 @@
echo $this->Html->tag('div', '', array('class' => 'beta'));
}
?>
<div class="modal fade" id="layout-modal">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-body">
<p>Loading content...</p>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
</div>
</div><!-- /.modal-content -->
</div><!-- /.modal-dialog -->
</div><!-- /.modal -->
<div class="modal fade" id="layout-modal"></div>
</body>
</html>
8 changes: 4 additions & 4 deletions app/View/Pages/home.ctp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,18 @@
<?php if(Configure::read('Feature.user_registration')) { ?>
<?php
echo $this->Form->create('User', array('action' => 'signup'));
echo $this->Form->input('email', array('label' => false, 'placeholder' => __('Email Address'), 'class' => 'form-control input-large'));
echo $this->Form->input('email', array('label' => false, 'placeholder' => __('Email Address'), 'class' => 'form-control input-lg'));
?>
<br>
<?php
echo $this->Form->input('password', array('label' => false, 'placeholder' => __('Password'), 'class' => 'form-control input-large'));
echo $this->Form->input('password', array('label' => false, 'placeholder' => __('Password'), 'class' => 'form-control input-lg'));
// Simple bot circumvent
echo '<div style="display: none">';
echo $this->Form->input('confirm_password');
echo '</div>';
echo '<br/>';
?>
<button type="submit" class="btn btn-success btn-block btn-large"><?php echo __('Sign Up') ?></button>
<button type="submit" class="btn btn-success btn-block btn-lg"><?php echo __('Sign Up') ?></button>
<?php echo $this->Form->end(); ?>
<br>
<p><?php echo __('Already have an account?');?> <?php echo $this->Html->link(__('Login') . '!', '/login'); ?></p>
Expand Down Expand Up @@ -51,7 +51,7 @@
</div>
</div>
<br>
<div class="container text-center hidden-sm" style="margin-bottom: 40px;">
<div class="container text-center hidden-xs" style="margin-bottom: 40px;">
<img src="/img/demo1.png"/>
</div>
<div class="container text-center" style="margin-bottom: 40px;">
Expand Down
23 changes: 12 additions & 11 deletions app/View/Searches/find.ctp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,19 @@
?>
<h2>Found <?php echo $paging['count']; ?> results for &quot;<?php echo $this->request->data['Search']['query']; ?>&quot;.</h2>
<br/>
<?php foreach ($results as $result) { ?>
<div class="container-item-list" >
<p class="container-item-list-content">
<?php echo Sanitize::html($result['ContainerItem']['body'], array('remove' => true)); ?><br/>
<?php echo $this->Html->link($result['Container']['name'], array('controller' => 'containers', 'action' => 'view', $result['Container']['slug'])); ?><br/>
<small><?php echo $this->Time->timeAgoInWords($result['ContainerItem']['modified']); ?></small>
</p>
<div style="clear: both"></div>
</div>
<?php } ?>
<div class="list-group">
<?php foreach ($results as $result): ?>
<a href="<?php echo Router::url(array('controller' => 'containers', 'action' => 'view', $result['Container']['slug'])) ?>" class="list-group-item">
<p><?php echo Sanitize::html($result['ContainerItem']['body'], array('remove' => true)); ?></p>
<p>
<?php echo $result['Container']['name']; ?>
(<small><?php echo $this->Time->timeAgoInWords($result['ContainerItem']['modified']); ?></small>)
</p>
</a>
<?php endforeach ?>
</div>
<?php
}
?>
<h4 style="margin-top: 20px;"><?php echo __("I created an item, but it doesn't show it when I search!"); ?></h4>
<p><?php echo __('Please allow up to 1 minute for your item to become searchable.'); ?></p>
<p><?php echo __('Please allow up to 1 minute for your item to become searchable.'); ?></p>
6 changes: 3 additions & 3 deletions app/View/Users/forgot_password.ctp
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<div class="container">
<div class="row">
<div class="col-lg-4 col-offset-4">
<div class="col-lg-4 col-md-offset-4">
<h2><?php echo __('Password Recovery'); ?></h2>
<?php if(Configure::read('Feature.forgot_password')) { ?>
<?php
echo $this->Form->create('User', array('url' => array('action' => 'forgot_password')));
echo $this->Form->input('email', array('placeholder' => __('Email Address'), 'label' => false, 'class' => 'form-control input-large')).'<br/><br/>';
echo $this->Form->input('email', array('placeholder' => __('Email Address'), 'label' => false, 'class' => 'form-control input-lg')).'<br/><br/>';
?>
<button type="submit" class="btn btn-default btn-block"><?php echo __('Reset Password') ?></button>
<button type="submit" class="btn btn-lg btn-default btn-block"><?php echo __('Reset Password') ?></button>
<?php
echo '<br/>';
echo $this->Form->end();
Expand Down
8 changes: 4 additions & 4 deletions app/View/Users/login.ctp
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
<div class="container">
<div class="row">
<div class="col-lg-4 col-offset-4">
<div class="col-lg-4 col-md-offset-4">
<h2><?php echo __('Login'); ?></h2>
<?php
echo $this->Form->create();
echo $this->Form->input('email', array('label' => false, 'placeholder' => __('Email Address'), 'class' => 'form-control input-large'));
echo $this->Form->input('email', array('label' => false, 'placeholder' => __('Email Address'), 'class' => 'form-control input-lg'));
?>
<br>
<?php
echo $this->Form->input('password', array('label' => false, 'placeholder' => __('Password'), 'class' => 'form-control input-large')) . '<br>';
echo $this->Form->input('password', array('label' => false, 'placeholder' => __('Password'), 'class' => 'form-control input-lg')) . '<br>';
echo $this->Html->link(__('Forgot password?'), array('action' => 'forgot_password')) . '<br> <br>';
?>
<button type="submit" class="btn btn-primary btn-block"><?php echo __('Login') ?></button>
<button type="submit" class="btn btn-lg btn-primary btn-block"><?php echo __('Login') ?></button>
<?php echo $this->Form->end(); ?>
<br/>
<p><?php echo __("Don't have an account?"); ?> <br/> <?php echo $this->Html->link(__('Create one!'), '/signup'); ?></p>
Expand Down
8 changes: 4 additions & 4 deletions app/View/Users/signup.ctp
View file
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
<div class="container">
<div class="row">
<div class="col-lg-4 col-offset-4">
<div class="col-lg-4 col-md-offset-4">
<h2><?php echo __('Join Boxmeup'); ?></h2>
<?php if(Configure::read('Feature.user_registration')) { ?>
<?php echo $this->Html->script('jquery.showpassword', array('inline' => true)); ?>
<?php echo $this->Html->script('views/users/signup', array('inline' => true)); ?>
<?php
echo $this->Form->create('User');
echo $this->Form->input('email', array('label' => false, 'placeholder' => __('Email Address'), 'class' => 'form-control input-large')) . '<br>';
echo $this->Form->input('password', array('label' => false, 'placeholder' => __('Password'), 'class' => 'form-control input-large')) . '<br>';
echo $this->Form->input('email', array('label' => false, 'placeholder' => __('Email Address'), 'class' => 'form-control input-lg')) . '<br>';
echo $this->Form->input('password', array('label' => false, 'placeholder' => __('Password'), 'class' => 'form-control input-lg')) . '<br>';
// Simple bot circumvent
echo '<div style="display: none">';
echo $this->Form->input('confirm_password');
echo '</div>';
echo '<br/>';
?>
<button type="submit" class="btn btn-success btn-block"><?php echo __('Sign Up') ?></button>
<button type="submit" class="btn btn-lg btn-success btn-block"><?php echo __('Sign Up') ?></button>
<?php echo $this->Form->end(); ?>
<?php } else { ?>
<p><?php echo __('User registration is temporarily unavailable.'); ?></p>
Expand Down
6 changes: 0 additions & 6 deletions app/webroot/js/app.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,6 @@ $(function() {
boxmeup.dismissMessage();
return false;
});
$('body').on('hidden.bs.modal', function (e) {
$(e.target)
.removeData('bs.modal')
.find('.modal-body')
.html('Content loading...');
});

// Search autocomplete
if (BMU_CLIENT.features.autocomplete) {
Expand Down
Loading

0 comments on commit decca21

Please sign in to comment.