Skip to content

Commit

Permalink
Adjust pages.
Browse files Browse the repository at this point in the history
  • Loading branch information
@mozillazg
mozillazg committed Mar 18, 2013
1 parent 55c3ac0 commit a461e95
Show file tree
Hide file tree
Showing 7 changed files with 175 additions and 131 deletions.
21 changes: 12 additions & 9 deletions flasksites/templates/add_site.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,57 +6,60 @@


{% block breadcrumb %}
<li><a href="index.html">Home</a><span class="divider">/</span></li>
<li class="active">Submit site</li>
<li><a href="index.html">Home</a><span class="divider">/</span></li><li class="active">Submit site</li>
{% endblock %}


{% block main %}
<!--<div class="row">-->
<!--<div class="span8 offset2">-->
<form class="form-horizontal" action="" method="post">

<fieldset>
<legend>Base info</legend>
<div class="row">
<div class="span8 offset2">
<div class="control-group">
<label class="control-label" for="site_title">Site title:</label>
<div class="controls">
<input type="text" class="input-xlarge" id="site_title" name="title" required="required">
<p class="help-block">title</p>
</div>
</div>
<div class="control-group">
<label class="control-label" for="site_url">Site URL:</label>
<div class="controls">
<input type="url" class="input-xlarge" id="site_url" name="url" required="required">
<p class="help-block">URL</p>
</div>
</div>
<div class="control-group">
<label class="control-label" for="site_description">Site Description:</label>
<div class="controls">
<textarea rows="3" id="site_description" class="input-xlarge" required="required" name="description"></textarea>
<p class="help-block">Description</p>
</div>
</div>
<div class="control-group">
<label class="control-label" for="site_tags">Site Tags:</label>
<div class="controls">
<input type="text" class="input-xlarge" id="site_tags" name="tags">
<p class="help-block">Separate tags with comma</p>
</div>
</div>
</div>
</div>
<!--</fieldset>-->
<!--<fieldset>-->
<!--<legend>Other info</legend>-->

<div class="form-actions">
<div class="row">
<div class="span6 offset2">
<!--<button type="submit" class="btn btn-primary pull-right">Create a account</button>-->
<button type="submit" class="btn btn-primary">Submit an site</button>
<!--<button type="submit" class="btn">Cancel</button>-->
</div>
</div>
</div>
</fieldset>
</form>
<!--</div>-->
</div>

<!--</div>-->
</div>
{% endblock %}
47 changes: 23 additions & 24 deletions flasksites/templates/detail.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@


{% block breadcrumb %}
<li><a href="/">Home</a><span class="divider">/</span></li>
<li class="active">{{ site.website|shorter_url }}</li>
<li><a href="/">Home</a><span class="divider">/</span></li><li class="active">{{ site.website|shorter_url }}</li>
{% endblock %}

{% block main %}
Expand All @@ -22,38 +21,38 @@

<div class="clearfix"></div>
<div class="well">
<li>URL: <a href="{{ site.website }}">{{ site.website }}</a></li>
<li>URL: {{ site.website|urlize }}</li>
<li>Tags:
{% for tag in site.tags %}
<a href="{{ url_for('tagged', tag_name=tag.name) }}">{{ tag.name }}</a>
{% endfor %}
</li>
<li>Source Code: <a href="{{ site.source_url }}">{{ site.source_url }}</a></li>
<li>Source Code: {{ site.source_url|urlize }}</li>
<li>Submitted by: <a href="{{ url_for('submitted_by', username=site.submitted_by.username)}}">{{ site.submitted_by.username }}</a> at {{ site.submitted_at|format_datetime }}</li>
</div>
</ul>
</div>

<div class="span3">
<ul class="inline">
<li><a href="#">tag</a></li>
<li><a href="#">tag</a></li>
<li><a href="#">tag</a></li>
<li><a href="#">tag</a></li>
<li><a href="#">tag</a></li>
<li><a href="#">tag</a></li>
<li><a href="#">tag</a></li>
<li><a href="#">tag</a></li>
<li><a href="#">tag</a></li>
<li><a href="#">tag</a></li>
<li><a href="#">tag</a></li>
<li><a href="#">tag</a></li>
<li><a href="#">tag</a></li>
<li><a href="#">tag</a></li>
<li><a href="#">tag</a></li>
<li><a href="#">tag</a></li>
</ul>
</div>
<!--<div class="span3">-->
<!--<ul class="inline">-->
<!--<li><a href="#">tag</a></li>-->
<!--<li><a href="#">tag</a></li>-->
<!--<li><a href="#">tag</a></li>-->
<!--<li><a href="#">tag</a></li>-->
<!--<li><a href="#">tag</a></li>-->
<!--<li><a href="#">tag</a></li>-->
<!--<li><a href="#">tag</a></li>-->
<!--<li><a href="#">tag</a></li>-->
<!--<li><a href="#">tag</a></li>-->
<!--<li><a href="#">tag</a></li>-->
<!--<li><a href="#">tag</a></li>-->
<!--<li><a href="#">tag</a></li>-->
<!--<li><a href="#">tag</a></li>-->
<!--<li><a href="#">tag</a></li>-->
<!--<li><a href="#">tag</a></li>-->
<!--<li><a href="#">tag</a></li>-->
<!--</ul>-->
<!--</div>-->

</div>
{% endblock %}
44 changes: 22 additions & 22 deletions flasksites/templates/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@

{% block main %}
<div class="row">
<div class="span10">
<div class="span12">
<ul class="thumbnails">
{% for site in sites.items %}
<li class="span5">
<li class="span4">
<div class="thumbnail">
<h5>{{ site.title }}</h5>
<a href="{{ url_for('show_site', site_id=site.id) }}" class="">
Expand All @@ -29,26 +29,26 @@ <h5>{{ site.title }}</h5>

</div>

<div class="span2">
<ul class="inline">
<li><a href="#">tag</a></li>
<li><a href="#">tag</a></li>
<li><a href="#">tag</a></li>
<li><a href="#">tag</a></li>
<li><a href="#">tag</a></li>
<li><a href="#">tag</a></li>
<li><a href="#">tag</a></li>
<li><a href="#">tag</a></li>
<li><a href="#">tag</a></li>
<li><a href="#">tag</a></li>
<li><a href="#">tag</a></li>
<li><a href="#">tag</a></li>
<li><a href="#">tag</a></li>
<li><a href="#">tag</a></li>
<li><a href="#">tag</a></li>
<li><a href="#">tag</a></li>
</ul>
</div>
<!--<div class="span2">-->
<!--<ul class="inline">-->
<!--<li><a href="#">tag</a></li>-->
<!--<li><a href="#">tag</a></li>-->
<!--<li><a href="#">tag</a></li>-->
<!--<li><a href="#">tag</a></li>-->
<!--<li><a href="#">tag</a></li>-->
<!--<li><a href="#">tag</a></li>-->
<!--<li><a href="#">tag</a></li>-->
<!--<li><a href="#">tag</a></li>-->
<!--<li><a href="#">tag</a></li>-->
<!--<li><a href="#">tag</a></li>-->
<!--<li><a href="#">tag</a></li>-->
<!--<li><a href="#">tag</a></li>-->
<!--<li><a href="#">tag</a></li>-->
<!--<li><a href="#">tag</a></li>-->
<!--<li><a href="#">tag</a></li>-->
<!--<li><a href="#">tag</a></li>-->
<!--</ul>-->
<!--</div>-->

</div>
{% endblock %}
48 changes: 29 additions & 19 deletions flasksites/templates/layout.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,18 @@
//border: solid #EEE 1px;
//padding-top: 20px;
}
.span12 .thumbnails .span4 {
min-width: 300px;
max-width: 300px;
min-height: 300px;
max-height: 300px;
}
</style>
</head>
<body style="padding-top:60px;" data-offset="50">

<!-- navbar -->
<div class="navbar navbar-inverse navbar-fixed-top">
<header class="navbar navbar-inverse navbar-fixed-top">
<div class="navbar-inner">
<div class="container">

Expand All @@ -32,7 +38,7 @@
<li><a href="">About</a><li>
<li>
<form class="navbar-search pull-left" action="{{ url_for('search') }}" method="get">
<input placeholder="Search Sites" name="q" type="text" class="search-query">
<input placeholder="Search Sites" name="q" type="text" class="search-query" {% if keyword %}value="{{ keyword}}"{% endif %}>
</form>
</li>
</ul>
Expand All @@ -41,29 +47,28 @@
<li><a href="{{ url_for('add_site') }}">Submit</a></li>
<li><a href="{{ url_for('mine') }}">{{ session.user.username }}</a></li>
<li><a href="{{ url_for('preference') }}">Perference</a></li>
<li><a href="{{ url_for('logout') }}">Logout</a></li>
<li><a href="{{ url_for('logout') }}">Log Out</a></li>
{% else %}
<li><a href="{{ url_for('register') }}">Singup</a></li>
<li><a href="{{ url_for('login') }}">Login</a></li>
<li><a href="{{ url_for('register') }}">Create Account</a></li>
<li><a href="{{ url_for('login') }}">Sign In</a></li>
{% endif %}
</ul>

</div>
</div>
</div>
</header>
<!-- end navbar -->

<!-- main -->
<div class="container">

<ul class="breadcrumb ">
{% block breadcrumb %}
<!--<li><a href="index.html">Home</a><span class="divider">/</span></li>-->
{% block breadcrumb %}
<li class="active">Home</li>
{% endblock %}
{% endblock %}
</ul>

{% block notice%}
{% block alert %}
{% endblock %}

<div id="main" class="container">
Expand All @@ -73,20 +78,25 @@

</div>

<footer class="footer container">
<!--<div class="row">-->
<!--<div class="span12">-->
<!--footer-->
<!--</div>-->
<!--</div>-->
{% block footer %}
{% endblock %}
</footer>

{% block js %}
<script src="/static/js/jquery-1.9.1.min.js"></script>
<script src="/static/js/bootstrap.min.js"></script>
<script src="/static/js/holder.js"></script>
{% endblock %}


<div class="clearfix"></div>
<footer class="footer">
{% block footer %}
<div class="container">
<ul class="inline">
<li>About</li>
<li><a href="https://github.com/mozillazg/flask-sites">Source Code</a></li>
</ul>
</div>
{% endblock %}
</footer>

</body>
</html>
68 changes: 39 additions & 29 deletions flasksites/templates/login.html
View file
Original file line number Diff line number Diff line change
@@ -1,48 +1,58 @@
{% extends "layout.html" %}

{% block title %}
Sign in :: {{ super() }}
Sign In :: {{ super() }}
{% endblock %}


{% block breadcrumb %}
<li><a href="/">Home</a><span class="divider">/</span></li>
<li class="active">Sign in</li>
<li><a href="/">Home</a><span class="divider">/</span></li><li class="active">Sign In</li>
{% endblock %}


{% block main %}
<form class="form-horizontal login" action="" method="post">
<fieldset>
<legend>Sign in</legend>
{% if error %}
{% block alert %}
{% if error %}
<div class="alert alert-error">
<button type="button" class="close" data-dismiss="alert">&times;</button>
{{ error }}
</div>
{% endif %}
<div class="control-group">
<label class="control-label" for="inputEmail">Email</label>
<div class="controls">
<input type="text" id="inputEmail" name="email" placeholder="Email" required="required">
</div>
</div>
<div class="control-group">
<label class="control-label" for="inputPassword">Password</label>
<div class="controls">
<input type="password" id="inputPassword" name="password" placeholder="Password" required="required">
</div>
</div>
<div class="control-group">
<div class="controls">
<label class="checkbox">
<input type="checkbox" name="remeber"> Remember me
</label>
{% endif %}
{% endblock %}

{% block main %}
<form class="form-horizontal login" action="" method="post">
<fieldset>
<legend>Sign In</legend>

<div class="row">
<div class="span8 offset2">
<div class="control-group">
<label class="control-label" for="inputEmail">Email</label>
<div class="controls">
<input type="email" id="inputEmail" name="email" placeholder="Email" required="required">
</div>
</div>
<div class="control-group">
<label class="control-label" for="inputPassword">Password</label>
<div class="controls">
<input type="password" id="inputPassword" name="password" placeholder="Password" required="required">
</div>
</div>
<!--<div class="control-group">-->
<!--<div class="controls">-->
<!--<label class="checkbox">-->
<!--<input type="checkbox" name="remeber"> Remember me-->
<!--</label>-->
<!--</div>-->
<!--</div>-->
</div>
</div>

<div class="form-actions">
<button type="submit" class="btn btn-primary">Sign in</button>
<!--<button type="submit" class="btn">Sign in</button>-->
<div class="row">
<div class="span6 offset2">
<button type="submit" class="btn btn-primary">Sign In</button>
</div>
</div>
</div>
</fieldset>
</form>
Expand Down
Loading

0 comments on commit a461e95

Please sign in to comment.