diff options
11 files changed, 90 insertions, 12 deletions
diff --git a/mediagoblin/templates/mediagoblin/auth/login.html b/mediagoblin/templates/mediagoblin/auth/login.html index d5a5ddef..47b8393d 100644 --- a/mediagoblin/templates/mediagoblin/auth/login.html +++ b/mediagoblin/templates/mediagoblin/auth/login.html @@ -20,7 +20,7 @@ {% import "/mediagoblin/utils/wtforms.html" as wtforms_util %} {% block mediagoblin_content %} - <h2>Login:</h2> + <h1>Login:</h1> <form action="{{ request.urlgen('mediagoblin.auth.login') }}" method="POST" enctype="multipart/form-data"> diff --git a/mediagoblin/templates/mediagoblin/auth/login.html~ b/mediagoblin/templates/mediagoblin/auth/login.html~ index 19d90907..d5a5ddef 100644 --- a/mediagoblin/templates/mediagoblin/auth/login.html~ +++ b/mediagoblin/templates/mediagoblin/auth/login.html~ @@ -33,7 +33,7 @@ {{ wtforms_util.render_table(login_form) }} <tr> <td></td> - <td><input type="submit" value="submit" /></td> + <td><input type="submit" value="submit" class="button_green"/></td> </tr> </table> diff --git a/mediagoblin/templates/mediagoblin/base.html~ b/mediagoblin/templates/mediagoblin/base.html~ index 07be3c47..d73d8c20 100644 --- a/mediagoblin/templates/mediagoblin/base.html~ +++ b/mediagoblin/templates/mediagoblin/base.html~ @@ -23,8 +23,6 @@ </head> <body> - <h1>GNU MediaGoblin at your duty!</h1> - <!-- OLD CODE HERE {% block mediagoblin_body %} {% block mediagoblin_header %} <table id="mediagoblin_header"> @@ -67,6 +65,6 @@ {% block mediagoblin_content %} {% endblock mediagoblin_content %} </div> - {% endblock mediagoblin_body %}--> + {% endblock mediagoblin_body %} </body> </html> diff --git a/mediagoblin/templates/mediagoblin/media_details.html~ b/mediagoblin/templates/mediagoblin/media_details.html~ index 1b02c809..bd63a289 100644 --- a/mediagoblin/templates/mediagoblin/media_details.html~ +++ b/mediagoblin/templates/mediagoblin/media_details.html~ @@ -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) }}" /> diff --git a/mediagoblin/templates/mediagoblin/root.html~ b/mediagoblin/templates/mediagoblin/root.html~ index fa78bda2..e2b2730a 100644 --- a/mediagoblin/templates/mediagoblin/root.html~ +++ b/mediagoblin/templates/mediagoblin/root.html~ @@ -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> diff --git a/mediagoblin/templates/mediagoblin/submit/start.html b/mediagoblin/templates/mediagoblin/submit/start.html index 21a7ed4e..8b446417 100644 --- a/mediagoblin/templates/mediagoblin/submit/start.html +++ b/mediagoblin/templates/mediagoblin/submit/start.html @@ -20,7 +20,7 @@ {% import "/mediagoblin/utils/wtforms.html" as wtforms_util %} {% block mediagoblin_content %} - <h2>Submit yer media</h2> + <h1>Submit yer media</h1> <form action="{{ request.urlgen('mediagoblin.submit.start') }}" method="POST" enctype="multipart/form-data"> diff --git a/mediagoblin/templates/mediagoblin/submit/start.html~ b/mediagoblin/templates/mediagoblin/submit/start.html~ index 562d9050..21a7ed4e 100644 --- a/mediagoblin/templates/mediagoblin/submit/start.html~ +++ b/mediagoblin/templates/mediagoblin/submit/start.html~ @@ -28,7 +28,7 @@ {{ wtforms_util.render_table(submit_form) }} <tr> <td></td> - <td><input type="submit" value="submit" /></td> + <td><input type="submit" value="submit" class="button_green" /></td> </tr> </table> </form> diff --git a/mediagoblin/templates/mediagoblin/user_pages/media.html b/mediagoblin/templates/mediagoblin/user_pages/media.html index 08cc9251..e07cee44 100644 --- a/mediagoblin/templates/mediagoblin/user_pages/media.html +++ b/mediagoblin/templates/mediagoblin/user_pages/media.html @@ -20,11 +20,11 @@ {# temporarily, an "image gallery" that isn't one really ;) #} {% if media %} - <h2>Media details for <a + <h1>Media details for <a href="{{ request.urlgen('mediagoblin.user_pages.user_home', user= media.uploader.username) }}">{{media.uploader.username}}</a> / {{media.title}} - </h2> + </h1> <div> <img src="{{ request.app.public_store.file_url( media.media_files.main) }}" /> diff --git a/mediagoblin/templates/mediagoblin/user_pages/media.html~ b/mediagoblin/templates/mediagoblin/user_pages/media.html~ new file mode 100644 index 00000000..08cc9251 --- /dev/null +++ b/mediagoblin/templates/mediagoblin/user_pages/media.html~ @@ -0,0 +1,41 @@ +{# +# 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 <a + href="{{ request.urlgen('mediagoblin.user_pages.user_home', + user= media.uploader.username) }}">{{media.uploader.username}}</a> + / {{media.title}} + </h2> + <div> + <img src="{{ request.app.public_store.file_url( + media.media_files.main) }}" /> + + <br/>Uploaded on {{ "%4d-%02d-%02d"|format(media.created.year, + media.created.month,media.created.day)}} by <a + href="{{ request.urlgen('mediagoblin.user_pages.user_home', + user= media.uploader.username) }}">{{media.uploader.username}}</a> + <br/>Description: {{media.description}} + </div> + {% else %} + <p>Sorry, no such media found.<p/> + {% endif %} +{% endblock %} diff --git a/mediagoblin/templates/mediagoblin/user_pages/user.html b/mediagoblin/templates/mediagoblin/user_pages/user.html index 85f05e08..5c8692fc 100644 --- a/mediagoblin/templates/mediagoblin/user_pages/user.html +++ b/mediagoblin/templates/mediagoblin/user_pages/user.html @@ -18,7 +18,7 @@ {% extends "mediagoblin/base.html" %} {% block mediagoblin_content -%} {% if user %} - <h2>User page for '{{ user.username }}'</h2> + <h1>User page for '{{ user.username }}'</h1> {#- Should we outsource such a media 'gallery' view to it's own file? It could be useful for the home page and other views too -#} diff --git a/mediagoblin/templates/mediagoblin/user_pages/user.html~ b/mediagoblin/templates/mediagoblin/user_pages/user.html~ new file mode 100644 index 00000000..4ae7986e --- /dev/null +++ b/mediagoblin/templates/mediagoblin/user_pages/user.html~ @@ -0,0 +1,39 @@ +{# +# 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 -%} + {% if user %} + <h1>User page for '{{ user.username }}'</h1s> + + {#- Should we outsource such a media 'gallery' view to it's own file? + It could be useful for the home page and other views too -#} + <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> + {% else %} + {# This *should* not occur as the view makes sure we pass in a user. #} + <p>Sorry, no such user found.<p/> + {% endif %} +{% endblock %} |