Lots of stuff

- Imagestore gallery
- remember me fixed
- youtube filter
- password change option
This commit is contained in:
Martin Bauer
2013-10-03 11:27:06 +02:00
parent 0e26988867
commit 114a2df9cf
179 changed files with 4987 additions and 159 deletions

View File

@@ -0,0 +1,23 @@
{% load thumbnail %}
<div id='gallery'>
{% for image in album.images.all %}
{% thumbnail image.image "120x120" crop="center" as im %}
{% thumbnail image.image "600x600" as full %}
<a rel='gallery[pp_gal]' href="{{ full.url }}">
<img class="preview" {% if image.title %} alt="{{ image.title }}" {% endif %} src="{{ im.url }}">
</a>
{% endthumbnail %}
{% endthumbnail %}
{% endfor %}
<script type="text/javascript" charset="utf-8">
$(function() {
$("a[rel^='gallery']").prettyPhoto({
allow_resize: true,
changepicturecallback: function() {
$(".pp_overlay").css("height", $(document).height());
}
});
});
</script>
</div>

View File

@@ -0,0 +1 @@
{% include 'cms/plugins/imagestore_album_carousel_base.html' %}

View File

@@ -0,0 +1,28 @@
{% load thumbnail %}
<div id='examples'>
<ul id='carusel{{ carousel.id }}' class="{{ carousel.skin }}" >
{% for image in images %}
{% thumbnail image.image carousel.size crop="center" as im %}
{% thumbnail image.image carousel.full_size as full %}
<li><a rel='gallery{{ carousel.id }}[pp_gal]' href="{{ full.url }}">
<img class="preview" {% if image.title %} alt="{{ image.title }}" {% endif %} src="{{ im.url }}">
</a></li>
{% endthumbnail %}
{% endthumbnail %}
{% endfor %}
</ul>
<script type="text/javascript">
$(function(){
$('#carusel{{ carousel.id }}').jcarousel();
$("a[rel^='gallery{{ carousel.id }}']").prettyPhoto({
allow_resize: true,
changepicturecallback: function() {
$(".pp_overlay").css("height", $(document).height());
}
});
})
</script>
</div>

View File

@@ -0,0 +1,14 @@
{% extends "imagestore/base.html" %}
{% load i18n %}
{% block imagestore_content %}
<p>{% trans "Are you sure that you would like to delete this album?" %}</p>
<form method="post" action=".">
{% csrf_token %}
<p>
<a class='btn' href="{{ post.get_absolute_url }}">← {% trans "No, take me back" %}</a>
<input type="submit" class='btn danger' value="{% trans 'Yes, I am sure' %}" />
</p>
</form>
{% endblock %}

View File

@@ -0,0 +1,70 @@
{% extends "imagestore/base.html" %}
{% load i18n %}
{% load thumbnail %}
{% block title %}
{% if view_user %}
{% trans "Albums for user" %} {{ view_user }}
{% else %}
{% trans "All albums" %}
{% endif %}
{% endblock %}
{% block imagestore-breadcrumb %}
<li>
{% if view_user %}
{% trans "Albums for user" %} {{ view_user }}
{% else %}
{% trans "All albums" %}
{% endif %}
</li>
{% endblock %}
{% block imagestore-info %}
{% if view_user and IMAGESTORE_SHOW_USER %}
{% with user=view_user %}
{% include "imagestore/user_info.html" %}
{% endwith %}
{% endif %}
{% endblock %}
{% block imagestore-related %}
{% include "imagestore/tag-cloud.html" %}
{% endblock %}
{% block imagestore_content %}
<h1>{% if view_user %}
{% trans "Albums for user" %} {{ view_user }}
{% else %}
{% trans "All albums" %}
{% endif %}</h1>
{% include "imagestore/pagination.html" %}
<div class='album-list'>
{% for album in album_list %}
{% if album.get_head or album.user == request.user %}
<div class='album'>
<div class='album-head'>
<a href="{{ album.get_absolute_url }}">
{% if album.get_head %}
{% thumbnail album.get_head.image "150x150" crop='center' as album_head %}
<img class="preview" {% if album.name %} alt="{{ album.name }}" {% endif %} src="{{ album_head.url }}">
{% endthumbnail %}
{% else %}
[{% trans "Empty album" %}]
{% endif %}
<br>
<span class="album-name">{{ album.name }}</span>
{% if not view_user and IMAGESTORE_SHOW_USER %}
<br>
<span class="album-user">
{% trans "user" %}: {{ album.user }}
</span>
{% endif %}
</a>
</div>
</div>
{% endif %}
{% endfor %}
</div>
{% include "imagestore/pagination.html" %}
{% endblock %}

View File

@@ -0,0 +1,64 @@
{% extends "website/base.html" %}
{% load i18n %}
{% load url from future %}
{% load sekizai_tags staticfiles %}
{% block navbar_options %} navbar navbar-inverse navbar-static-top {% endblock %}
{% block content %}
{% include "imagestore/pphoto.html" %}
{% addtoblock "css" %}
<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}imagestore.css" media="screen" />
{% endaddtoblock %}
<div class="container">
<div class="row">
<div class="span12">
{% block breadcrumb %}
<ul class='breadcrumb'>
{% if request.path != '/' %}
<li><a href="/">{% trans "Home" %}</a> <span class="divider">/</span></li>
{% endif %}
{% if request.path != imagestore_index_url %}
<li><a href="{{ imagestore_index_url }}">{% trans "Gallery" %}</a> <span class="divider">/</span></li>
{% endif %}
{% block imagestore-breadcrumb %}
{% endblock %}
</ul>
{% endblock %}
{% block imagestore_content %}
{% endblock imagestore_content %}
{% block imagestore_content-related %}
{% block imagestore-info %}
{% endblock %}
<div id="controls">
<ul>
{% if imagestore_perms.add_image or request.user.is_superuser %}
<li><a href={% url 'imagestore:upload' %}>{% trans "Upload image" %}</a></li>
{% endif %}
{% if imagestore_perms.add_album or request.user.is_superuser %}
<li><a href={% url 'imagestore:create-album' %}>{% trans "Create new album" %}</a></li>
{% endif %}
{% block controls %}
{% endblock controls %}
</ul>
</div>
{% block imagestore-related %}
{% endblock %}
{% endblock %}
</div>
</div>
</div>
{% endblock content %}

View File

@@ -0,0 +1,33 @@
{% extends "imagestore/base.html" %}
{% load i18n %}
{% load thumbnail %}
{% block title %}
{% trans "Create album" %}
{% endblock %}
{% block imagestore-breadcrumb %}
<li>
{% if object %}
{% trans "Edit album" %}: {{ object.name }}
{% else %}
{% trans "Create album" %}
{% endif %}
</li>
{% endblock %}
{% block imagestore_content %}
<h1>
{% if object %}
{% trans "Edit album" %}: {{ object.name }}
{% else %}
{% trans "Create album" %}
{% endif %}
</h1>
<form action="." method="post" class='album-form'>
{% csrf_token %}
{{ form.as_p }}
<input type="submit" value="{% trans "Save" %}" class='btn success'>
</form>
{% endblock imagestore_content %}

View File

@@ -0,0 +1,21 @@
{% extends "imagestore/base.html" %}
{% load i18n %}
{% load thumbnail %}
{% load url from future %}
{% block title %}
{% trans "Upload image" %}
{% endblock %}
{% block imagestore-breadcrumb %}
<li>{% trans "Upload image" %}</li>
{% endblock %}
{% block imagestore_content %}
<h1>{% trans "Upload image" %}</h1>
<form action="." method="post" enctype="multipart/form-data" class='upload-image'>
{% csrf_token %}
{{ form.as_p }}
<input type="submit" value="{% trans "Upload" %}" class='btn success'>
</form>
{% endblock imagestore_content %}

View File

@@ -0,0 +1,10 @@
{% load url from future %}
{% if album %}
{% url 'imagestore:image-album' album_id=album.id pk=image.id %}
{% else %}
{% if tag %}
{% url 'imagestore:image-tag' tag=tag pk=image.id %}
{% else %}
{{ image.get_absolute_url }}
{% endif %}
{% endif %}

View File

@@ -0,0 +1,22 @@
{% load i18n %}
{% load thumbnail %}
<div id="image-thumbnails">
{% for image in image_list %}
{% thumbnail image.image "120x120" crop="center" as im %}
<a class="thumb" rel='gallery-image[ilist]' href="{{ image.image.url }}">
<img class="preview" {% if image.title %} alt="{{ image.title }}" {% endif %} src="{{ im.url }}">
</a>
<a href="{% url '{{ image.get_absolute_url }}' %}">
{% if image.title %}
<br><span class='image-title'>{{ image.title }}</span>
{% else %}
{% trans 'Info' %}
{% endif %}
</a>
{% endthumbnail %}
{% endfor %}
{% include "imagestore/pagination.html" %}
</div>

View File

@@ -0,0 +1,16 @@
{% load i18n %}
{% if view_user %}
{% if scope_tag %}<{{ scope_tag }} class='scope-view-user'>{% endif %}
{% trans "User" %}: {{ view_user }}
{% if scope_tag %}</{{ scope_tag }}>{% endif %}
{% endif %}
{% if album %}
{% if scope_tag %}<{{ scope_tag }} class='scope-album'>{% endif %}
{% trans "Album" %}: {{ album.name }}
{% if scope_tag %}</{{ scope_tag }}>{% endif %}
{% endif %}
{% if tag %}
{% if scope_tag %}<{{ scope_tag }} class='scope-album'>{% endif %}
{% trans "Tag" %}: {{ tag }}
{% if scope_tag %}</{{ scope_tag }}>{% endif %}
{% endif %}

View File

@@ -0,0 +1,89 @@
{% extends "imagestore/base.html" %}
{% load i18n %}
{% load thumbnail %}
{% load tagging_tags %}
{% load url from future %}
{% block title %}
{% trans "Image" %} - {{ image.title }}
{% endblock %}
{% block imagestore-breadcrumb %}
{% if view_user and IMAGESTORE_SHOW_USER %}
<li class='scope-view-user'><a href="{% url 'imagestore:user-images' username=view_user %}">{% trans "User" %}: {{ view_user }}</a> <span class="divider">/</span></li>
{% endif %}
{% if album %}
<li class='scope-album'><a href="{{ album.get_absolute_url }}">{% trans "Album" %}: {{ album.name }}</a> <span class="divider">/</span></li>
{% endif %}
{% if tag %}
<li class='scope-tag'><a href="{% url 'imagestore:tag' tag=tag %}">{% trans "Tag" %}: {{ tag }}</a> <span class="divider">/</span></li>
{% endif %}
<li>
{% if image.title %}
{{ image.title }}
{% else %}
{{ image.id }}
{% endif %}
</li>
{% endblock %}
{% block imagestore-info %}
<div class='user-info'>
{% if IMAGESTORE_SHOW_USER %}
{% with user=image.user %}
{% include "imagestore/user_info.html" %}
{% endwith %}
{% endif %}
</div>
{% endblock %}
{% block imagestore_content %}
{% if image.title %}<h1>{{ image.title }}</h1>{% endif %}
{% if album or tag or view_user %}
<h2>
{% include "imagestore/image-scope.html" %}
</h2>
{% endif %}
<div class="image-description">
{{ image.description }}
</div>
<div id="image-view">
<div class="navigation">
{% if previous %} <a class="previous-link" href="
{% with previous as image %}
{% include "imagestore/image-href.html" %}
{% endwith %}
">← {% trans "previous image" %}</a> {% endif %}
{% if next %} <a class="next-link" href="{% with next as image %}
{% include "imagestore/image-href.html" %}
{% endwith %}">{% trans "next image" %} →</a> {% endif %}
</div>
{% thumbnail image.image "800x800" as full_im %}
<img class="preview" {% if image.title %} alt="{{ image.title }}" {% endif %} src="{{ full_im.url }}">
{% endthumbnail %}
</div>
{% endblock imagestore_content %}
{% block controls %}
{% if request.user == image.user or perms.imagestore.moderate_images %}
<li><a href="{% url 'imagestore:update-image' image.id %}">{% trans "Edit info" %}</a></li>
<li><a href="{% url 'imagestore:delete-image' image.id %}">{% trans "Delete image" %}</a></li>
{% endif %}
{% endblock %}
{% block imagestore-related %}
<div class="tagging">
<h2>{% trans "Tags" %}</h2>
{% tags_for_object image as itags %}
{% for tag in itags %}
<a href="{% url 'imagestore:tag' tag.name %}">{{ tag.name }}</a>
{% endfor %}
</div>
{% if image.place %}
<div class='place'>
<h2>{% trans "Place" %}</h2>
<a href="{{ image.place.get_absolute_url }}">{{ image.place.name }} →</a>
</div>
{% endif %}
{% endblock %}

View File

@@ -0,0 +1,14 @@
{% extends "imagestore/base.html" %}
{% load i18n %}
{% block imagestore_content %}
<p>{% trans "Are you sure that you would like to delete this image?" %}</p>
<form method="post" action=".">
{% csrf_token %}
<p>
<a class='btn' href="{{ post.get_absolute_url }}">← {% trans "No, take me back" %}</a>
<input type="submit" class='btn danger' value="{% trans 'Yes, I am sure' %}" />
</p>
</form>
{% endblock %}

View File

@@ -0,0 +1,14 @@
{% extends "imagestore/base.html" %}
{% load i18n %}
{% block imagestore_content %}
<p>{% trans "Are you sure that you would like to delete this image?" %}</p>
<form method="post" action=".">
{% csrf_token %}
<p>
<a class='btn' href="{{ post.get_absolute_url }}">← {% trans "No, take me back" %}</a>
<input type="submit" class='btn danger' value="{% trans 'Yes, I am sure' %}" />
</p>
</form>
{% endblock %}

View File

@@ -0,0 +1,65 @@
{% extends "imagestore/base.html" %}
{% load i18n %}
{% load thumbnail %}
{% load url from future %}
{% block imagestore-breadcrumb %}
{% with "li" as scope_tag %}
{% include "imagestore/image-scope.html" %}
{% endwith %}
{% endblock %}
{% block title %}
{% include "imagestore/image-scope.html" %}
{% endblock %}
{% block imagestore-info %}
{% if view_user and IMAGESTORE_SHOW_USER %}
{% with user=view_user %}
{% include "imagestore/user_info.html" %}
{% endwith %}
{% endif %}
{% if album and IMAGESTORE_SHOW_USER %}
{% with user=album.user %}
{% include "imagestore/user_info.html" %}
{% endwith %}
{% endif %}
{% endblock %}
{% block controls %}
{% if album %}
{% if request.user == album.user or perms.imagestore.moderate_albums %}
<li><a href='{% url 'imagestore:update-album' pk=album.pk %}'>{% trans "Edit album" %}</a></li>
{% endif %}
{% endif %}
{% endblock %}
{% block imagestore_content %}
<h1>
{% include "imagestore/image-scope.html" %}
</h1>
{% include "imagestore/pagination.html" %}
<div id="image-thumbnails">
{% for image in image_list %}
<div class='image-preview'>
{% thumbnail image.image "120x120" crop="center" as im %}
<a class="thumb" rel='gallery-image[ilist]' href="{{ image.image.url }}">
<img class="preview" {% if image.title %} alt="{{ image.title }}" {% endif %} src="{{ im.url }}">
</a>
<a href="{% include "imagestore/image-href.html" %}">
{% if image.title %}
<br><span class='image-title'>{{ image.title }}</span>
{% else %}
{% trans 'Info' %}
{% endif %}
</a>
{% endthumbnail %}
</div>
{% endfor %}
</div>
{% include "imagestore/pagination.html" %}
{% endblock %}

View File

@@ -0,0 +1,26 @@
{% load i18n %}
{% if is_paginated %}
<div class="pagination">
<ul>
<li class="prev {% if not page_obj.has_previous %}disabled{% endif %}">
<a href="{% if page_obj.has_previous %}?page={{ page_obj.previous_page_number }}{% else %}#{% endif %}" >← {% trans "previous page" %}</a>
</li>
{% for page in page_obj.pages %}
{% if page %}
<li {% ifequal page page_obj.number %}class="disabled"{% endifequal %}>
<a href="?{{ page.querystring }}" class="page">{{ page }}</a>
</li>
{% else %}
<li class="disabled">
...
</li>
{% endif %}
{% endfor %}
<li class="next {% if not page_obj.has_next %}disabled{% endif %}">
<a href="{% if page_obj.has_next %}?page={{ page_obj.next_page_number }}{% else %}#{% endif %}" >{% trans "next page" %} →</a>
</li>
</ul>
</div>
{% endif %}

View File

@@ -0,0 +1,28 @@
{% load sekizai_tags staticfiles %}
{% addtoblock "css" %}
<link rel="stylesheet" href="{{ STATIC_URL }}prettyphoto/css/prettyPhoto.css" type="text/css" media="screen" charset="utf-8" />
{% endaddtoblock %}
{% addtoblock "js" %}
<script src="{{ STATIC_URL }}prettyphoto/js/jquery.prettyPhoto.js" type="text/javascript" charset="utf-8"></script>
<script type="text/javascript" charset="utf-8">
var prettyparams = {
animation_speed: 'fast',
slideshow: 3000,
autoplay_slideshow: false,
opacity: 0.7,
show_title: true,
allow_resize: true,
default_width: 1000,
default_height: 1000,
counter_separator_label: '/',
theme: 'light_rounded',
overlay_gallery: true,
social_tools: false,
changepicturecallback: function() {$pp_overlay.css({'height':$(document).height()})},
};
$(function(){$("a[rel^='gallery-image']").prettyPhoto(prettyparams)});
</script>
{% endaddtoblock %}

View File

@@ -0,0 +1,13 @@
{% load tagging_tags %}
{% load i18n %}
{% load url from future %}
{% if IMAGESTORE_SHOW_TAGS %}
<div id="tag-cloud">
<h1>{% trans "Tags" %}</h1>
{% tag_cloud_for_model imagestore.Image as image_tags %}
{% for tag in image_tags %}
<a href={% url 'imagestore:tag' tag.name %}>{{ tag.name }}</a>
{% endfor %}
</div>
{% endif %}

View File

@@ -0,0 +1,21 @@
{% extends "imagestore/base.html" %}
{% load i18n %}
{% load thumbnail %}
{% block title %}
{% trans "Gallery" %} - {% trans "Tag" %}: {{ tag }}
{% endblock %}
{% block imagestore-breadcrumb %}
<li>{% trans "Tag" %}: {{ tag }}</li>
{% endblock %}
{% block imagestore_content %}
<h1>{% trans "Tag" %} - {{ tag }}</h1>
{% include "imagestore/image-list.html" %}
{% endblock imagestore_content %}
{% block imagestore_content-related %}
{% include "imagestore/tag-cloud.html" %}
{% endblock %}

View File

@@ -0,0 +1,22 @@
{% load i18n %}
{% load thumbnail %}
{# if we can't get profile then return user model itself #}
{% with profile=user.get_profile|default_if_none:user %}
<div class="user-info">
<h2>{% trans "User" %}</h2>
<div class="avatar">
<a href="{{ profile.get_absolute_url }}">
{% thumbnail profile.avatar "80x80" as avatar %}
<img src="{{ avatar.url }}" alt="avatar">
{% empty %}
{% endthumbnail %}
</a>
</div>
<div class="user-name">
<a href="{{ profile.get_absolute_url }}">
{{ user }}
</a>
</div>
</div>
{% endwith %}