Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

edit permalink bug

  • Loading branch information...
commit 5265b0358dfdf9cad9f2676ee1ace22415a7da93 1 parent d6355ad
@danieleguido authored
View
3  glue/models.py
@@ -101,7 +101,8 @@ def json( self ):
'abstract': self.abstract,
'content': self.content,
'language': self.language,
- 'mimetype': self.mimetype
+ 'mimetype': self.mimetype,
+ 'permalink': self.permalink
}
View
6 static/js/oo/glue.js
@@ -69,9 +69,10 @@ oo.glue.resize = function(){
oo.glue.pin.listeners.edit = function( event ){
var pin_id = $(this).attr("data-id");
oo.log("[oo.glue.pin.listeners.edit] pin id :", pin_id);
-
+ oo.toast( oo.i18n.translate('loading') );
// get pin and activate modal
oo.api.pin.get({id:pin_id}, function( result ){
+ $().toastmessage("cleanToast");
oo.log("[oo.api.pin.get:callback]", result);
$("#id_edit_pin_id").val( pin_id );
$("#id_edit_pin_title").val( result.object.title );
@@ -88,6 +89,9 @@ oo.glue.pin.listeners.edit = function( event ){
oo.glue.pin.listeners.update = function(event){ event.preventDefault();
var el = $(this);
+
+
+
// get django form auto_id
var auto_id = el.attr("data-auto-id");
oo.log("[oo.glue.init:$('.update-pin'):click] form namespace 'auto_id' : ", auto_id);
View
9 static/less/style.less
@@ -120,7 +120,7 @@ h2{
.item{
margin-bottom: @grid-padding;
- padding-bottom: @grid-padding;
+ padding-bottom: @grid-padding / 2;
border-bottom: 1px solid #ccc;
h3{
.serif-slant(17px);
@@ -131,7 +131,7 @@ h2{
color: #000;
}
blockquote{
- padding: @grid-padding/2 0;
+ padding: @grid-padding/2 0 0 @grid-padding/2;
margin:0;
}
@@ -435,4 +435,9 @@ input.invalid, textarea.invalid{
}
.modal-body{
max-height: 600px;
+}
+
+blockquote{
+ border-left: 0px solid transparent;
+
}
View
3  templates/walt/index.html
@@ -215,8 +215,9 @@ <h2 style="text-align: center"><a href="{% url walt_login %}">&rarr; {% trans "p
{{ pin.abstract }}
</blockquote>
-
+ {% if pin.permalink %}
<a class="external" href="{{ pin.permalink}}">&rarr; {{ pin.permalink}}</a>
+ {% endif %}
{% for child in pin.children.all|slice:":10" %}
<div class="comment">
View
2  templates/walt/middle.html
@@ -11,7 +11,7 @@ <h1 style="float: left; margin:0; margin-right:24px"><a href="{% url walt_home %
<div style="margin:12px; ">
<a href="{% url walt_home %}" {% if 'home' in tags %}class="active"{% endif %}>{% trans "all walts" %}</a> |
{% if user.is_authenticated %}
- <a href="{% url walt_spiff user.username %}" {% if 'my-walt' in tags %}class="active"{% endif %}>{% trans "my walt"%} ( {{ user.username }} )</a> |
+ <a href="{% url walt_spiff user.username %}" {% if 'my-walt' in tags %}class="active"{% endif %}>{% trans "my walt"%} ( {{ user.username }} )</a> ||
{% endif %}
<a href="{% url walt_series %}">{% trans "all series" %} ({{ series.count }})</a> |
{% if user.is_authenticated %}
Please sign in to comment.
Something went wrong with that request. Please try again.