heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixing changes

Browse Source
This commit is contained in:
Jef van Schendel 2011-05-13 15:33:19 -05:00 committed by Christopher Allan Webber
parent 1013bdaff2
commit 881b6e2c32
13 changed files with 307 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
mediagoblin/static/css/base.css
View File

@ -1 +1,70 @@
/* stuff goes here :) */
body {
background-color: #272727;
background-image: url('back.png');
color: #f7f7f7;
font-family: sans;
padding:none;
margin:0px;
}
h1 {
font-family: 'Carter One', arial, serif;
margin-bottom: 20px;
margin-top:50px;
}
.dottedLine {
width:100%;
height:0px;
border-bottom: dotted 1px #5f5f5f;
position:absolute;
left:0px;
margin-top:-20px;
}
a {
color: #d12929;
border-bottom: 1px dotted;
text-decoration: none;
}
.header {
width:100%;
height:60px;
background-image:url('header_back.png');
padding-top:40px;
margin-bottom:80px;
}
.container {
width: 800px;
margin-left: auto;
margin-right: auto;
}
.button {
font-family: 'Carter One', arial, serif;
height: 28px;
min-width: 99px;
box-shadow: 0px 0px 5px #000;
border-radius: 5px;
border: none;
color: #272727;
margin: 10px;
font-size: 1em;
float: left;
display: block;
text-align: center;
padding-top: 4px;
padding-left:11px;
padding-right:11px;
}
.buttonRed {
background-image: url('button_red.png');
}
.buttonGreen {
background-image: url('button_green.png');
}

70
mediagoblin/static/css/base.css~ Normal file
View File

@ -0,0 +1,70 @@
body {
background-color: #272727;
background-image: url('back.png');
color: #f7f7f7;
font-family: sans;
padding:none;
margin:0px;
}
h1 {
font-family: 'Carter One', arial, serif;
margin-bottom: 20px;
margin-top:50px;
}
.dottedLine {
width:100%;
height:0px;
border-bottom: dotted 1px #5f5f5f;
position:absolute;
left:0px;
margin-top:-20px;
}
a {
color: #d12929;
border-bottom: 1px dotted;
text-decoration: none;
}
.header {
width:100%;
height:60px;
background-image:url('header_back.png');
padding-top:40px;
margin-bottom:80px;
}
.container {
width: 800px;
margin-left: auto;
margin-right: auto;
}
.button {
font-family: 'Carter One', arial, serif;
height: 28px;
min-width: 99px;
box-shadow: 0px 0px 5px #000;
border-radius: 5px;
border: none;
color: #272727;
margin: 10px;
font-size: 1em;
float: left;
display: block;
text-align: center;
padding-top: 4px;
padding-left:11px;
padding-right:11px;
}
.buttonRed {
background-image: url('button_red.png');
}
.buttonGreen {
background-image: url('button_green.png');
}

BIN
mediagoblin/static/images/back.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 26 KiB

BIN
mediagoblin/static/images/button_green.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.0 KiB

BIN
mediagoblin/static/images/button_red.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
mediagoblin/static/images/header_back.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 26 KiB

BIN
mediagoblin/static/images/logo.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 57 KiB

5
mediagoblin/templates/mediagoblin/base.html
View File

@ -23,7 +23,8 @@
</head>
<body>
<body>
<h1>GNU MediaGoblin at your duty!</h1>
<!-- OLD CODE HERE
{% block mediagoblin_body %}
{% block mediagoblin_header %}
<table id="mediagoblin_header">
@ -66,6 +67,6 @@
{% block mediagoblin_content %}
{% endblock mediagoblin_content %}
</div>
{% endblock mediagoblin_body %}
{% endblock mediagoblin_body %}-->
</body>
</html>

72
mediagoblin/templates/mediagoblin/base.html~ Normal file
View File

@ -0,0 +1,72 @@
{#
# GNU MediaGoblin -- federated, autonomous media hosting
# Copyright (C) 2011 Free Software Foundation, Inc
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#}
<html>
<head>
<title>{% block title %}MediaGoblin{% endblock title %}</title>
<link rel="stylesheet" type="text/css"
href="{{ request.staticdirect('/css/base.css') }}"/>
</head>
<body>
<h1>GNU MediaGoblin at your duty!</h1>
<!-- OLD CODE HERE
{% block mediagoblin_body %}
{% block mediagoblin_header %}
<table id="mediagoblin_header">
<tr>
<td id="mediagoblin_logo">
{% block mediagoblin_logo %}
<a href="{{ request.urlgen('index') }}">MediaGoblin</a>
{% endblock %}
</td>
<td>{% block mediagoblin_header_title %}MediaGoblin Home{% endblock %}</td>
</tr>
<tr>
<td></td>
<td>
{% block mediagoblin_header_subtitle %}
Clever subtitle here!
{% endblock %}</td>
</tr>
{% if request.user %}
<tr>
<td></td>
<td>
Welcome {{ request.user['username'] }}! --
<a href="{{ request.urlgen('mediagoblin.auth.logout') }}">
Logout</a>
</td>
</tr>
{% else %}
<tr>
<td></td>
<td>
<a href="{{ request.urlgen('mediagoblin.auth.login') }}">
Login</a>
</td>
</tr>
{% endif %}
</table>
{% endblock %}
<div id="mediagoblin_content">
{% block mediagoblin_content %}
{% endblock mediagoblin_content %}
</div>
{% endblock mediagoblin_body %}-->
</body>
</html>

2
mediagoblin/templates/mediagoblin/media_details.html
View File

@ -20,7 +20,7 @@
{# temporarily, an "image gallery" that isn't one really ;) #}
{% if media %}
<h2>Media details for {{media.title}}</h2>
<h1>Media details for {{media.title}}</h1>
<div>
<img src="{{ request.app.public_store.file_url(
media.media_files.main) }}" />

34
mediagoblin/templates/mediagoblin/media_details.html~ Normal file
View File

@ -0,0 +1,34 @@
{#
# GNU MediaGoblin -- federated, autonomous media hosting
# Copyright (C) 2011 Free Software Foundation, Inc
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#}
{% extends "mediagoblin/base.html" %}
{% block mediagoblin_content %}
{# temporarily, an "image gallery" that isn't one really ;) #}
{% if media %}
<h2>Media details for {{media.title}}</h2>
<div>
<img src="{{ request.app.public_store.file_url(
media.media_files.main) }}" />
<br/>Uploaded: {{ media.created}}
<br/>Description: {{media.description}}
</div>
{% else %}
<p>Sorry, no such media found.<p/>
{% endif %}
{% endblock %}

2
mediagoblin/templates/mediagoblin/root.html
View File

@ -19,7 +19,7 @@
{% block mediagoblin_content %}
<h2>{% trans %}Welcome to GNU MediaGoblin!{% endtrans %}</h2>
<h1>{% trans %}Welcome to GNU MediaGoblin!{% endtrans %}</h1>
{% if request.user %}
<p>

56
mediagoblin/templates/mediagoblin/root.html~ Normal file
View File

@ -0,0 +1,56 @@
{#
# GNU MediaGoblin -- federated, autonomous media hosting
# Copyright (C) 2011 Free Software Foundation, Inc
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#}
{% extends "mediagoblin/base.html" %}
{% block mediagoblin_content %}
<h2>{% trans %}Welcome to GNU MediaGoblin!{% endtrans %}</h2>
{% if request.user %}
<p>
<a href="{{ request.urlgen('mediagoblin.submit.start') }}">Submit an item</a>.
</p>
{% else %}
<p>
If you have an account, you can
<a href="{{ request.urlgen('mediagoblin.auth.login') }}">Login</a>.
</p>
<p>
If you don't have an account, please
<a href="{{ request.urlgen('mediagoblin.auth.register') }}">Register</a>.
</p>
{% endif %}
{# temporarily, an "image gallery" that isn't one really ;) #}
<div>
<ul>
{% for entry in media_entries %}
<li>
<a href="{{ request.urlgen('mediagoblin.user_pages.media_home',
user= entry.uploader.username, m_id= entry._id) }}">
<img src="{{ request.app.public_store.file_url(
entry['media_files']['thumb']) }}" /></a>
</li>
{% endfor %}
</ul>
</div>
{% endblock %}