Skip to content

Commit

Permalink
updated some files
Browse files Browse the repository at this point in the history
  • Loading branch information
@jonniespratley
jonniespratley committed Jan 12, 2015
1 parent 938257c commit 3463a78
Show file tree
Hide file tree
Showing 19 changed files with 358 additions and 573 deletions.
4 changes: 3 additions & 1 deletion Gruntfile.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ var startNodeServer = function(){
var server = new cmsRouter.mount(config, _app);
};

var serverEndpoint = 'http://localhost:8181';
var serverEndpoint = 'http://127.0.0.1:8181';
var proxyConfig = {
proxy: {
forward: {
Expand Down Expand Up @@ -456,7 +456,9 @@ module.exports = function (grunt) {
'coffee',
'ngtemplates',
'copy:styles',
//'copy:dist',
'svgmin',
'imagemin',
'htmlmin'
]
},
Expand Down
14 changes: 7 additions & 7 deletions app/scripts/config.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ window.Config = {
baseurl: document.location.origin,
sitetitle: 'angular-cms',
sitedesc: 'This is the description',
sitebrand: '/images/angular-cms-brand.png',
sitebrand: 'images/angular-cms-brand.png',
sitecopy: '2014 ',
version: '0.1',
email: '[email protected]',
Expand All @@ -16,32 +16,32 @@ window.Config = {
id: 1,
title: 'HTML5',
body: 'Using HTML5 in every way to make a better user experience.',
image: '/images/feature-html5.png'
image: 'images/feature-html5.png'
}, {
id: 2,
title: 'AngularJS',
body: 'The client-side framework of choice is Angular, its a full-stack.',
image: '/images/feature-angular.png'
image: 'images/feature-angular.png'
}, {
id: 3,
title: 'Twitter Bootstrap',
body: 'The client-side UI of choice is Twitter Bootstrap 3.0.',
image: '/images/feature-bootstrap.png'
image: 'images/feature-bootstrap.png'
}, {
id: 4,
title: 'PhantomJS',
body: 'Fully testable with Jasmine Karma Runner Unit e2e with PhantomJS.',
image: '/images/feature-phantomjs.png'
image: 'images/feature-phantomjs.png'
}, {
id: 5,
title: 'NodeJS',
body: 'The server of choice is NodeJS, its fast and scalable.',
image: '/images/feature-nodejs.png'
image: 'images/feature-nodejs.png'
}, {
id: 6,
title: 'MongoDB',
body: 'The database of choice is Mongo, its fast and scalable.',
image: '/images/feature-mongodb.png'
image: 'images/feature-mongodb.png'
}
],
session: {
Expand Down
264 changes: 69 additions & 195 deletions app/views/index.html
View file
Original file line number Diff line number Diff line change
@@ -1,196 +1,70 @@
<!doctype html>
<div class="col-xs-12 col-sm-9 col-md-10">
<ol class="breadcrumb">
<li>
<a href="#">Home</a>
</li>
<li>
<a href="#">Appearance</a>
</li>
<li class="active">
Themes
</li>
</ol>

<html>

<head>
<title>Themes</title>
<link rel="stylesheet" href="main.css">
<meta name="viewport" content="width=device-width">
<link href="//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css" rel="stylesheet">
<link rel="stylesheet" href="https://netdna.bootstrapcdn.com/bootstrap/3.0.0/css/bootstrap.min.css">
<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/2.0.3/jquery.min.js"></script>
<script type="text/javascript" src="https://netdna.bootstrapcdn.com/bootstrap/3.0.0/js/bootstrap.min.js"></script>
<style type="text/css">
/* * Style tweaks * -------------------------------------------------- */
body {
padding-top: 70px;
}
footer {
padding-left: 15px;
padding-right: 15px;
}
/* * Off Canvas * -------------------------------------------------- */
@media screen and(max-width: 768px) {
.row-offcanvas {
position: relative;
-webkit-transition: all 0.25s ease-out;
-moz-transition: all 0.25s ease-out;
transition: all 0.25s ease-out;
}
.row-offcanvas-right .sidebar-offcanvas {
right: -50%;
/* 6 columns */
}
.row-offcanvas-left .sidebar-offcanvas {
left: -50%;
/* 6 columns */
}
.row-offcanvas-right.active {
right: 50%;
/* 6 columns */
}
.row-offcanvas-left.active {
left: 50%;
/* 6 columns */
}
.sidebar-offcanvas {
position: absolute;
top: 0;
width: 50%;
/* 6 columns */
}
}
</style>
</head>

<body>
<div class="navbar navbar-fixed-top navbar-inverse" role="navigation">
<div class="container">
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
<span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="#">angular-cms</a>
</div>
<div class="collapse navbar-collapse">
<ul class="nav navbar-nav">
<li class="active">
<a href="#">Dashboard</a>
</li>
<li>
<a href="#contact">Contact</a>
</li>
</ul>
<ul class="nav navbar-nav pull-right">
<li>
<a href="#about">jonniedollas</a>
</li>
</ul>
</div>
<!-- /.nav-collapse -->
</div>
<!-- /.container -->
</div>
<!-- /.navbar -->
<div class="container">
<div class="row row-offcanvas row-offcanvas-left">
<div class="col-xs-6 col-sm-3 col-md-2 sidebar-offcanvas" id="sidebar" role="navigation">
<div class="well sidebar-nav">
<ul class="nav nav-list">
<li class="nav-header">
<i class="glyphicon glyphicon-picture"></i> Appearance</li>
<li class="active">
<a href="#">Themes</a>
</li>
<li>
<a href="#">Customize</a>
</li>
<li>
<a href="#">Widgets</a>
</li>
<li>
<a href="#">Menus</a>
</li>
<li class="nav-header">
<i class="glyphicon glyphicon-cog"></i> Settings</li>
<li>
<a href="#">General</a>
</li>
<li>
<a href="#">Permissions</a>
</li>
<li>
<a href="#">Media</a>
</li>
<li class="nav-header">
<i class="glyphicon glyphicon-user"></i> Users</li>
<li>
<a href="#">All Users</a>
</li>
<li>
<a href="#">Add User</a>
</li>
</ul>
</div>
<!--/.well -->
</div>
<!--/span-->
<div class="col-xs-12 col-sm-9 col-md-10">
<ol class="breadcrumb">
<li><a href="#">Home</a></li>
<li><a href="#">Appearance</a></li>
<li class="active">Themes</li>
</ol>

<!-- Nav tabs -->
<ul class="nav nav-tabs">
<li class="active">
<a href="#"> <i class="fa fa-2x fa-list-alt"></i> </a>
</li>
<li>
<a href="#" data-toggle="tab">Manage Themes</a>
</li>
<li>
<a href="#" data-toggle="tab">Install Theme</a>
</li>
<li>
<a href="#" data-toggle="tab">Settings</a>
</li>
</ul><br>
<div class="well well-sm">
<div class="row">
<div class="col-sm-4 col-md-4">
<img src="http://placehold.it/400x300" class="img-thumbnail">
</div>
<div class="col-md-8">
<small class="text-muted">Current Theme</small><h4>Twenty Twelve <small>1.0</small></h4>
<p>The 2012 theme for Angular-CMS takes us back to the Bootstrap 2.3, featuring a full range of post formats, each displayed beautifully in their own unique way. Design details abound, starting with a vibrant color scheme and matching header images, beautiful typography and icons, and a flexible layout that looks great on any device, big or small.</p>
<p class="text-muted"><span>OPTIONS:</span> <a href="#">Widgets</a> | <a href="#">Menus</a> | <a href="#">Header</a></p>
</div>
</div>
</div>
<div class="row">
<div class="col-sm-4 col-md-4 theme-item">
<img src="http://placehold.it/300x150" class="img-thumbnail">
<h4>Twenty Thirteen</h4>
<p class="text-muted">By jonniespratley</p>
<p class="actions hidden-sm"><a href="#">Activate</a> | <a href="#">Live Preview</a> <span class="pull-right"> <a href="#" class="danger">Delete</a> </span></p>
</div>
<div class="col-sm-4 col-md-4">
<img src="http://placehold.it/300x150" class="img-thumbnail">
<h4>Twenty Fourteen</h4>
<p class="text-muted">By jonniespratley</p>
<p class="actions hidden-sm"><a href="#">Activate</a> | <a href="#">Live Preview</a> <span class="pull-right"> <a href="#" class="danger">Delete</a> </span></p>
</div>
<div class="col-sm-4 col-md-4"></div>
</div>
</div>
<!--/span-->
</div>
<!--/row-->
<hr>
<footer>
<p class="text-muted">&copy; Company 2013</p>
</footer>
</div>
<!--/.container-->
<script>
$(document).ready(function() {
$('[data-toggle=offcanvas]').click(function() {
$('.row-offcanvas').toggleClass('active');
});
});
</script>
</body>

</html>
<!-- Nav tabs -->
<ul class="nav nav-tabs">
<li class="active">
<a href="#"> <i class="fa fa-2x fa-list-alt"></i> </a>
</li>
<li>
<a href="#" data-toggle="tab">Manage Themes</a>
</li>
<li>
<a href="#" data-toggle="tab">Install Theme</a>
</li>
<li>
<a href="#" data-toggle="tab">Settings</a>
</li>
</ul>
<br>
<div class="well well-sm">
<div class="row">
<div class="col-sm-4 col-md-4">
<img src="http://placehold.it/400x300" class="img-thumbnail">
</div>
<div class="col-md-8">
<small class="text-muted">Current Theme</small><h4>Twenty Twelve <small>1.0</small></h4>
<p>
The 2012 theme for Angular-CMS takes us back to the Bootstrap 2.3, featuring a full range of post formats, each displayed beautifully in their own unique way. Design details abound, starting with a vibrant color scheme and matching header images, beautiful typography and icons, and a flexible layout that looks great on any device, big or small.
</p>
<p class="text-muted">
<span>OPTIONS:</span><a href="#">Widgets</a> | <a href="#">Menus</a> | <a href="#">Header</a>
</p>
</div>
</div>
</div>
<div class="row">
<div class="col-sm-4 col-md-4 theme-item">
<img src="http://placehold.it/300x150" class="img-thumbnail">
<h4>Twenty Thirteen</h4>
<p class="text-muted">
By jonniespratley
</p>
<p class="actions hidden-sm">
<a href="#">Activate</a> | <a href="#">Live Preview</a><span class="pull-right"> <a href="#" class="danger">Delete</a> </span>
</p>
</div>
<div class="col-sm-4 col-md-4">
<img src="http://placehold.it/300x150" class="img-thumbnail">
<h4>Twenty Fourteen</h4>
<p class="text-muted">
By jonniespratley
</p>
<p class="actions hidden-sm">
<a href="#">Activate</a> | <a href="#">Live Preview</a><span class="pull-right"> <a href="#" class="danger">Delete</a> </span>
</p>
</div>
<div class="col-sm-4 col-md-4"></div>
</div>
</div>
<!--/span-->
2 changes: 1 addition & 1 deletion app/views/main.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ <h1>
<div class="col-sm-12">

<div class="row">
<div ng-repeat="item in App.features" class="media col-sm-4">
<div ng-repeat="item in App.features" class="media">
<img
ng-src="{{App.config.cdn}}{{item.image}}"
height="50"
Expand Down
Loading

0 comments on commit 3463a78

Please sign in to comment.