Skip to content
This repository has been archived by the owner on Nov 1, 2022. It is now read-only.

Commit

Permalink
remove less and use layout
Browse files Browse the repository at this point in the history
  • Loading branch information
@Tug
Tug committed Nov 21, 2014
1 parent 8153eb1 commit 59aaf26
Show file tree
Hide file tree
Showing 6 changed files with 218 additions and 253 deletions.
2 changes: 1 addition & 1 deletion app/controllers/index.js
View file
Expand Up @@ -36,5 +36,5 @@ module.exports = function(app, model) {

return actions;

}
};

118 changes: 49 additions & 69 deletions app/views/chat.html
View file
@@ -1,76 +1,56 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8">
<title>Express-chat</title>
<meta name="description" content="Cloud chat application">
<meta name="author" content="Tug">
<% layout('layouts/default') -%>

<link rel="stylesheet" type="text/css" href="/static/css/bootstrap.css" />
<link rel="stylesheet/less" type="text/css" href="/static/css/styles.less">

<!--[if lt IE 9]>
<script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
<![endif]-->
<script src="/socket.io/socket.io.js" type="text/javascript"></script>
<script src="/static/js/socket.chat.js" type="text/javascript"></script>
<script src="/static/js/app.js" type="text/javascript"></script>

<script src="/static/lib/less-1.1.5.min.js" type="text/javascript"></script>
<script src="/static/lib/jquery-1.7.1.min.js" type="text/javascript"></script>
<script src="/static/lib/phpjs.js" type="text/javascript"></script>
<script src="/socket.io/socket.io.js" type="text/javascript"></script>
<script src="/static/js/socket.chat.js" type="text/javascript"></script>
<script src="/static/js/app.js" type="text/javascript"></script>

</head>

<body>
<div class="topbar">
<div class="fill">
<div class="container">
<a class="brand" href="#">Express-chat</a>
<ul class="nav">
<li class="active">
<a href="/">Home</a>
</li>
</ul>
<form action="" class="pull-right" onSubmit="return false">
<input id='name' type='text' name='name' class="input" placeholder="Username"/>
<button id='renameButton' class="btn" type="button">Rename</button>
</form>
</div>
<div class="topbar">
<div class="fill">
<div class="container">
<a class="brand" href="#">Express-chat</a>
<ul class="nav">
<li class="active">
<a href="/">Home</a>
</li>
</ul>
<form action="" class="pull-right" onSubmit="return false">
<input id='name' type='text' name='name' class="input" placeholder="Username"/>
<button id='renameButton' class="btn" type="button">Rename</button>
</form>
</div>
</div>
</div>

<div class="container">
<div class="content">
<div class="page-header">
<h1 id="title"><%= title %></h1>
<div class="container">
<div class="content">
<div class="page-header">
<h1 id="title"><%= title %></h1>
</div>
<div class="row">
<div class="span12">
<div>
<pre class="prettyprint scrollcontent"><ul id="messages" class="unstyled"></ul></pre>
</div>
<div>
<form class="form-horizontal">
<textarea class="write-area" rows="4" id='message' name='message'></textarea>
</form>
</div>
</div>
<div class="row">
<div class="span12">
<div>
<pre class="prettyprint scrollcontent"><ul id="messages" class="unstyled"></ul></pre>
</div>
<div>
<form class="form-horizontal">
<textarea class="write-area" rows="4" id='message' name='message'></textarea>
</form>
</div>
<div class="span4">
<div>
<pre class="prettyprint scrollcontent userlist"><ul id="users" class="unstyled"></ul></pre>
</div>
<div>
<button id='submitMessageButton' class="btn large">Send</button>
</div>
<div class="span4">
<div>
<pre class="prettyprint scrollcontent userlist"><ul id="users" class="unstyled"></ul></pre>
</div>
<div>
<button id='submitMessageButton' class="btn large">Send</button>
</div>
</div> <!-- /span4 -->
</div> <!-- /row -->
</div> <!-- /content -->

<footer>
<p>&copy; GPL licensed</p>
</footer>

</div> <!-- /container -->
</body>
</html>
</div> <!-- /span4 -->
</div> <!-- /row -->
</div> <!-- /content -->

<footer>
<p>&copy; GPL licensed</p>
</footer>

</div> <!-- /container -->

121 changes: 50 additions & 71 deletions app/views/home.html
View file
@@ -1,77 +1,56 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8">
<title>Express-chat</title>
<meta name="description" content="Cloud chat application">
<meta name="author" content="Tug">
<% layout('layouts/default') -%>

<link rel="stylesheet" type="text/css" href="/static/css/bootstrap.css" />
<link rel="stylesheet/less" type="text/css" href="/static/css/styles.less">

<!--[if lt IE 9]>
<script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
<![endif]-->

<script src="/static/lib/less-1.1.5.min.js" type="text/javascript"></script>
<script src="/static/lib/jquery-1.7.1.min.js" type="text/javascript"></script>
<script src="/static/lib/bootstrap-modal.js" type="text/javascript"></script>

</head>
<body>
<div class="container">
<div class="content">
<div class="page-header">
<h1>Express-chat demo</h1>
</div> <!-- /page-header -->
<div class="row">
<div class="span4">
<h2>Create chat room</h2>
</div>
<div class="span12">
<form id='CreateChatForm' name='formAction' method='post' action='/rooms/create'>
<fieldset>
<legend>Enter Room information</legend>
<div class="clearfix">
<label for="xlInput">Name</label>
<div class="input">
<input class="xlarge" id="title" name="title" size="30" type="text">
</div>
</div>
<div class="clearfix">
<label for="xlInput">Public</label>
<div class="input">
<input type="checkbox" class="input" name="ispublic" value="1" />
</div>
<div class="container">
<div class="content">
<div class="page-header">
<h1>Express-chat demo</h1>
</div> <!-- /page-header -->
<div class="row">
<div class="span4">
<h2>Create chat room</h2>
</div>
<div class="span12">
<form id='CreateChatForm' name='formAction' method='post' action='/rooms/create'>
<fieldset>
<legend>Enter Room information</legend>
<div class="clearfix">
<label for="xlInput">Name</label>
<div class="input">
<input class="xlarge" id="title" name="title" size="30" type="text">
</div>
<div class="actions">
<input type="submit" class="btn primary" value="Create">
</div>
<div class="clearfix">
<label for="xlInput">Public</label>
<div class="input">
<input type="checkbox" class="input" name="ispublic" value="1" />
</div>
</fieldset>
</form>
</div>
</div> <!-- /row -->
<div class="row">
<div class="span4">
<h2>Public rooms</h2>
</div>
<div class="span12">
<br/>
<ul class="rooms">
<% rooms.forEach(function(room) { %>
<li class="room">
<a href="/r/<%= room.id %>"><%= room.title || 'Room '+room.id %></a>
</li>
<% }); %>
</ul>
</div>
</div>
<div class="actions">
<input type="submit" class="btn primary" value="Create">
</div>
</fieldset>
</form>
</div>
</div> <!-- /row -->
<div class="row">
<div class="span4">
<h2>Public rooms</h2>
</div>
<div class="span12">
<br/>
<ul class="rooms">
<% rooms.forEach(function(room) { %>
<li class="room">
<a href="/r/<%= room.id %>"><%= room.title || 'Room '+room.id %></a>
</li>
<% }); %>
</ul>
</div>
</div> <!-- /content -->
</div>
</div> <!-- /content -->

<footer>
<p>&copy; GPL licensed</p>
</footer>
<footer>
<p>&copy; GPL licensed</p>
</footer>

</div> <!-- /container -->
</body>
</html>
</div> <!-- /container -->
24 changes: 24 additions & 0 deletions app/views/layouts/default.html
View file
@@ -0,0 +1,24 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8">
<title>Express-chat</title>
<meta name="description" content="Cloud chat application">
<meta name="author" content="Tug">

<link rel="stylesheet" type="text/css" href="/static/css/bootstrap.css" />
<link rel="stylesheet" type="text/css" href="/static/css/styles.css">

<!--[if lt IE 9]>
<script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
<![endif]-->

<script src="/static/lib/jquery-1.7.1.min.js" type="text/javascript"></script>
<script src="/static/lib/phpjs.js" type="text/javascript"></script>

</head>

<body>
<%-body -%>
</body>
</html>

0 comments on commit 59aaf26

Please sign in to comment.