Permalink
Browse files

last stand

  • Loading branch information...
1 parent 63c44cd commit ba440f26310826bfb0229d0166b2e51ae8585a7a @danieleguido committed Mar 21, 2013
Showing with 139 additions and 54 deletions.
  1. BIN static/img/link.png
  2. +67 −11 static/less/style.less
  3. +71 −42 templates/walt/index.html
  4. +1 −1 templates/walt/middle.html
View
BIN static/img/link.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
78 static/less/style.less
@@ -1,11 +1,18 @@
@import "mixins.less";
@import "fonts.less";
-@grid-padding: 24px;
+@grid-padding: 20px;
@header-height: 96px;
@red: #cc1600;
+@grigio-0: lighten(#3E454C, 65%);
+@grigio-1: lighten(#3E454C, 20%);
+@grigio-2: darken(#FFF6E5, 10%);
+@grigio-3: #FFF6E5;
+
+@blue: #2185C5;
+
//
// ================
// ---- mixins ----
@@ -33,15 +40,21 @@
body{
- background: white;
+ background: @grigio-0;
+
height: 100%;
.sans-serif(13px);
color: #383838;
}
+p{
+ margin: 0;
+ padding: 0;
+}
+
header{
width: 100%;
- background-color: white;
+ background-color: @grigio-0;
overflow: auto;
a{
line-height: 20px;
@@ -51,22 +64,34 @@ header{
}
}
+#menu{
+ //background-color: @grigio-3;
+}
#navbar{
- background-color: white;
+ background-color: @grigio-0;
h2{
border-bottom: 0px solid transparent;
+ background:@blue;
+
margin-top: 0;
padding-top: @grid-padding / 2;
margin-bottom: 0;
padding-bottom: @grid-padding / 2;
+ text-align: center;
+
+ .mono(14px, lowercase);
+
+ a, a:visited{
+ color: white;
+ }
}
.shadow div{
- border-top: 1px solid #999;
- border-bottom: 1px solid #ccc;
+ //border-top: 1px solid #999;
+ //border-bottom: 1px solid #ccc;
height:3px;
overflow: hidden;
}
@@ -118,9 +143,10 @@ h1{
.sans-serif(24px);
}
h2{
- .mono-caps(14px);
+ .mono(18px);
color: #000;
.description{
+ display: none;
.mono(12px, lowercase);
}
}
@@ -129,26 +155,56 @@ h2{
// height: 200px;
// min-height: 200px;
// overflow-y:auto;
+ margin-top: @grid-padding;
+
}
.item{
margin-bottom: @grid-padding;
padding-bottom: @grid-padding / 2;
- border-bottom: 1px solid #ccc;
+
+ padding: @grid-padding/4 @grid-padding/2;
+ // .border-distribute( #ababab );
+ background-color: #fff;
+ // .box-shadow( 0 1px 3px fade(#999, 65%) );
h3{
- .serif-slant(17px);
+ .serif-slant(16px);
color: #000;
+ a{
+ color: #292929;
+ }
}
h4{
- .serif(17px);
+ .serif(15px);
color: #000;
}
blockquote{
- padding: @grid-padding/2 0 0 @grid-padding/2;
+ padding: @grid-padding/3;
+ .sans-serif(12px);
margin:0;
}
+ .metadata{
+ margin-bottom: @grid-padding/2;
+ }
+ .actions{
+ border-top: 1px solid #e1e1e1;
+ margin: @grid-padding/2 0;
+ padding: @grid-padding/2 0 0 0;
+ overflow:auto;
+ a.action{
+ display:block;
+ float:left;
+ border-left: 1px solid #e1e1e1;
+ padding: @grid-padding/8 @grid-padding/2;
+ &:first-child{
+
+ border-left: 1px solid transparent;
+
+ }
+ }
+ }
}
#timeline-serie{
View
113 templates/walt/index.html
@@ -31,11 +31,12 @@ <h2 class="grid_3 alpha">
{% if user.is_authenticated %}
<a href="#add-walt-w-modal" role="button" data-toggle="modal" style="color: crimson">+ {% trans "add bookmark" %}</a>
{% endif %}
- <div class="description">
+ {% comment %}<div class="description">
{{ walt.wander.page.abstract }}
- </div>
+ </div>{% endcomment %}
+
</h2>
<h2 class="grid_3">
<a href="{% if spiff %}{% url walt_a_spiff spiff %}{% else %}{% url walt_a %}{% endif %}">{% if spiff %} his/her {% endif %} {{ walt.augment.page.title }}
@@ -44,9 +45,9 @@ <h2 class="grid_3">
{% if user.is_authenticated %}
<a href="#add-walt-a-modal" role="button" data-toggle="modal" style="color: crimson">+ {% trans "add object" %}</a>
{% endif %}
- <div class="description">
+ {% comment %}<div class="description">
{{ walt.augment.page.abstract }}
- </div>
+ </div>{% endcomment %}
</h2>
<h2 class="grid_3" >
<a href="{% if spiff %}{% url walt_l_spiff spiff %}{% else %}{% url walt_l %}{% endif %}">{% if spiff %} his/her {% endif %} {{ walt.learn.page.title }}
@@ -55,9 +56,9 @@ <h2 class="grid_3" >
{% if user.is_authenticated %}
<a href="#add-walt-l-modal" role="button" data-toggle="modal" style="color: crimson">+ {% trans "add publication" %}</a>
{% endif %}
- <div class="description">
+ {% comment %}<div class="description">
{{ walt.learn.page.abstract }}
- </div>
+ </div>{% endcomment %}
</h2>
<h2 class="grid_3 omega">
<a href="{% if spiff %}{% url walt_t_spiff spiff %}{% else %}{% url walt_t %}{% endif %}">{% if spiff %} his/her {% endif %} {{ walt.try.page.title }}
@@ -66,18 +67,18 @@ <h2 class="grid_3 omega">
{% if user.is_authenticated %}
<a href="#add-walt-t-modal" role="button" data-toggle="modal" style="color: crimson">+ {% trans "add tool" %}</a>
{% endif %}
- <div class="description">
+ {% comment %}<div class="description">
{{ walt.try.page.abstract }}
- </div>
+ </div>{% endcomment %}
</h2>
</div>
- <div class="grid_12 shadow" >
+ <!-- div class="grid_12 shadow" >
<div class="grid_3 alpha">&nbsp;</div>
<div class="grid_3">&nbsp;</div>
<div class="grid_3">&nbsp;</div>
<div class="grid_3 omega">&nbsp;</div>
- </div>
+ </div -->
{% endblock %}
@@ -131,8 +132,9 @@ <h2 class="grid_3 omega">
{% endif%}
{% else %}
- <!-- user is not authenticated -->
+ <!-- user is not authenticated
<h2 style="text-align: center"><a href="{% url walt_login %}">&rarr; {% trans "please login to start your serie"%} &larr;</a></h2>
+ -->
{% endif %}
{% endblock %}
@@ -158,28 +160,46 @@ <h2 style="text-align: center"><a href="{% url walt_login %}">&rarr; {% trans "p
<a href="{% url walt_tag tag.type|lower tag.slug %}" class="tag" alt="{{ tag.name }} ( {{ tag.type }} )">{{ tag.name }}</a>
{% if not forloop.last %},{%endif %}
{% endfor %}
- <span class="authors">
- &middot; {%trans "posted by" %}
- {% for u in pin.authors.all %}
- <a href="{% url walt_spiff u.username %}">{{ u.username }}</a>
- {% if not forloop.last %}, {% endif %}
- {% endfor %}
- </span>
- <span>
- <a href="#{% url admin:glue_pin_change pin.id %}" class="edit-pin" data-id="{{ pin.id }}">&rarr; {% trans "edit" %}</a>
- {% if workon_serie %}
- <a href="#{% url admin:glue_pin_change pin.id %}"
- class="append-frame" data-slug="{{ pin.slug }}" data-title="{{ pin.title }}" data-page-slug="wander" data-id="{{ pin.id }}" >&rarr; {% trans "add to current serie" %}</a>
- {% endif %}
- </span>
+
+
</div>
<blockquote>
{{ pin.abstract }}
-
</blockquote>
- {% if pin.permalink %}
- <a class="external" href="{{ pin.permalink}}">&rarr; {{ pin.permalink}}</a>
- {% endif %}
+ <div class="content">
+ {{ pin.content }}
+ </div>
+
+ {% with authors=pin.authors.all %}
+
+ <span class="authors">
+ {%trans "posted by" %}
+ {% for u in authors %}
+ <a href="{% url walt_spiff u.username %}">{{ u.username }}</a>
+ {% if not forloop.last %}, {% endif %}
+ {% endfor %}
+ </span>
+
+ <div class="actions">
+ <a href="#{% url admin:glue_pin_change pin.id %}" class="edit-pin action" data-id="{{ pin.id }}" title="{% trans "edit" %}">{% trans "modify" %}</a>
+
+ {% if pin.permalink %}
+ <a class="external action" href="{{ pin.permalink}}">{% trans "link" %}</a>
+ {% endif %}
+
+ {% if workon_serie %}
+ <a href="#{% url admin:glue_pin_change pin.id %}"
+ class="append-frame action" data-slug="{{ pin.slug }}" data-title="{{ pin.title }}" data-page-slug="wander" data-id="{{ pin.id }}" >{% trans "use in serie" %}</a>
+ {% endif %}
+
+ {% if user in authors %}
+ <a class="external action warning" href="{{ pin.permalink}}">{% trans "delete" %}</a>
+ {% endif %}
+ </div>
+
+ {% endwith %}
+
+
{% for child in pin.children.all|slice:":10" %}
<div class="comment">
@@ -207,24 +227,33 @@ <h2 style="text-align: center"><a href="{% url walt_login %}">&rarr; {% trans "p
<a href="{% url walt_tag tag.type|lower tag.slug %}" class="tag" alt="{{ tag.name }} ( {{ tag.type }} )">{{ tag.name }}</a>
{% if not forloop.last %},{%endif %}
{% endfor %}
- <span class="authors">
- &middot; {%trans "posted by" %}
- {% for u in pin.authors.all %}
- <a href="{% url walt_spiff u.username %}">{{ u.username }}</a>
- {% if not forloop.last %}, {% endif %}
- {% endfor %}
- </span>
- <span>
- <a href="#{% url admin:glue_pin_change pin.id %}" class="edit-pin" data-id="{{ pin.id }}">&rarr; {% trans "edit" %}</a>
- </span>
+
+ </div>
+ <div>
+ {{ pin.content|safe }}
</div>
+
<blockquote>
{{ pin.abstract }}
-
</blockquote>
- {{ pin.content|safe }}
- <a class="external" href="{{ pin.permalink}}">&rarr; {{ pin.permalink}}</a>
+ {% with authors=pin.authors.all %}
+ <span class="authors">
+ {%trans "posted by" %}
+ {% for u in authors %}
+ <a href="{% url walt_spiff u.username %}">{{ u.username }}</a>
+ {% if not forloop.last %}, {% endif %}
+ {% endfor %}
+ </span>
+ <div class="actions">
+ <a href="#{% url admin:glue_pin_change pin.id %}" class="edit-pin action" data-id="{{ pin.id }}" title="{% trans "edit" %}">{% trans "modify" %}</a>
+
+ <a class="external action" href="{{ pin.permalink}}">{% trans "link" %}</a>
+ {% if user in authors %}
+ <a class="external action warning" href="{{ pin.permalink}}">{% trans "delete" %}</a>
+ {% endif %}
+ </div>
+ {% endwith %}
{% for child in pin.children.all|slice:":10" %}
<div class="comment">
<a href="#" class="author"> </a> {{ child.abstract }}
View
2 templates/walt/middle.html
@@ -6,7 +6,7 @@
<header >
<div class="container_12">
- <div class="grid_12" style="border-bottom: 1px solid #ccc;">
+ <div id="menu" class="grid_12">
<h1 style="float: left; margin:0; margin-right:24px"><a href="{% url walt_home %}">walt.</a></h1>
<div style="margin:12px; ">
<a href="{% url walt_home %}" {% if 'home' in tags %}class="active"{% endif %}>{% trans "all walts" %}</a> |

0 comments on commit ba440f2

Please sign in to comment.