-
Notifications
You must be signed in to change notification settings - Fork 3
Annotate uu-internal links #316
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: staging
Are you sure you want to change the base?
Changes from all commits
2dd7c04
41c9975
c828cfe
dcbf416
b954e4e
bab138a
ccc0420
29da9a1
7bbbdae
b2e1436
4726a8f
a2f565d
221573d
e548437
e7fd850
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -16,11 +16,18 @@ | |
| a.interwiki { | ||
| background-repeat: no-repeat; | ||
| } | ||
| a.user, a.team, a.search { | ||
| /* these links are hardcoded into the markup-parser | ||
| and not configurable via the linkmap */ | ||
| a.user, a.team, a.search, a.ikhaya, a.paste { | ||
| background-repeat: no-repeat; | ||
| padding-left: 16px; | ||
| } | ||
|
|
||
| a.paste { | ||
| background-image: url(../img/favicon.ico); | ||
| } | ||
| a.ikhaya { | ||
| background-image: url(../img/icons/small/ikhaya.png); | ||
| } | ||
| a.user { | ||
| background-image: url(../img/interwiki/user.png); | ||
| } | ||
|
|
@@ -31,46 +38,39 @@ a.team { | |
| a.search { | ||
| background-image: url(../img/interwiki/search.png); | ||
| } | ||
|
|
||
| a.interwiki-bug { | ||
| background-image: url(../img/interwiki/bug.png); | ||
| padding-left: 20px; | ||
| } | ||
| a.interwiki-getdeb { | ||
| background-image: url(../img/interwiki/getdeb.png); | ||
| padding-left: 20px; | ||
| } | ||
| a.interwiki-googlecode { | ||
| background-image: url(../img/interwiki/googlecode.png); | ||
| padding-left: 20px; | ||
| } | ||
| a.interwiki-isbn { | ||
| background-image: url(../img/interwiki/isbn.png); | ||
| padding-left: 20px; | ||
| a[href^="https://wiki.ubuntuusers.de/"] { | ||
| background-image: url(../img/icons/small/wiki.png); | ||
| background-repeat: no-repeat; | ||
| padding-left: 18px; | ||
| } | ||
| a.interwiki-launchpad { | ||
| background-image: url(../img/interwiki/launchpad.png); | ||
| padding-left: 20px; | ||
| a[href^="https://forum.ubuntuusers.de/post/"] { | ||
| background-image: url(../img/icon_minipost.gif); | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. IMHO this will display the minipost-gif two times beneath a forum post, as there the current minipost-icon is includeded via I dont know if (For interwikilinks this should be working, as they also use a
Member
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
True
AFAIK (with :not) you can't select (an attribute of) a parent. We could just remove the img and permalink the full date (which is better usability IMO)
|
||
| background-repeat: no-repeat; | ||
| padding-left: 12px; | ||
| } | ||
| a.interwiki-lpuser { | ||
| background-image: url(../img/interwiki/lpuser.png); | ||
| padding-left: 20px; | ||
| a[href^="https://forum.ubuntuusers.de/topic/"] { | ||
| background-image: url(../img/forum/topic.png); | ||
| background-repeat: no-repeat; | ||
| background-size: 14px; | ||
| padding-left: 16px; | ||
| } | ||
| a.interwiki-sourceforge { | ||
| background-image: url(../img/interwiki/sourceforge.png); | ||
| padding-left: 20px; | ||
| a[href^="https://forum.ubuntuusers.de/forum/"] { | ||
| background-image: url(../img/icons/small/forum.png); | ||
| background-repeat: no-repeat; | ||
| padding-left: 16px; | ||
| } | ||
| a.interwiki-ubuntu { | ||
| background-image: url(../img/interwiki/ubuntu.png); | ||
| padding-left: 20px; | ||
| a[href$=".pdf"]:before { | ||
| content: '📄 '; | ||
| } | ||
| a.interwiki-wikipedia { | ||
| background-image: url(../img/interwiki/wikipedia.png); | ||
| padding-left: 20px; | ||
| a[href^="https://github.com"] { | ||
| background-image: url(../img/icons/small/github.png); | ||
MAH1987 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| background-repeat: no-repeat; | ||
| padding-left: 16px; | ||
| } | ||
| a.interwiki-wikipedia_en { | ||
| background-image: url(../img/interwiki/wikipedia_en.png); | ||
| padding-left: 20px; | ||
| a[href^="http://github.com"] { | ||
| background-image: url(../img/icons/small/github.png); | ||
| background-repeat: no-repeat; | ||
| padding-left: 16px; | ||
| } | ||
|
|
||
| #page table { | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,61 @@ | ||
| {# | ||
| portal/linkmap.html | ||
| ~~~~~~~~~~~~~~~~~~~ | ||
|
|
||
| This page administrates the link map for interwiki link shortcuts. | ||
|
|
||
| :copyright: (c) 2007-2019 by the Inyoka Team, see AUTHORS for more details. | ||
| :license: BSD, see LICENSE for more details. | ||
| #} | ||
| {% extends 'portal/overall.html' %} | ||
|
|
||
| {% set BREADCRUMBS = [(_('Link Map'), href('portal', 'linkmap'))] + BREADCRUMBS|d([]) %} | ||
|
|
||
| {% block content %} | ||
| <h3>{% trans %}Link Map{% endtrans %}</h3> | ||
| <p> | ||
| {% trans %}This Page lets you edit, delete and add external link shortcuts. The icons should be of the size 14px x 14px.{% endtrans %} | ||
| </p> | ||
|
|
||
| <form enctype="multipart/form-data" method="post" action=""> | ||
| {{ csrf_token() }} | ||
| {{ formset.management_form }} | ||
| {{ formset.non_form_errors() }} | ||
|
|
||
| <table> | ||
| <thead> | ||
| <tr> | ||
| {% for field in formset|first %} | ||
| {% if not field.is_hidden %} | ||
| <th> | ||
| {{ field.label }} | ||
| </th> | ||
| {% endif %} | ||
| {% endfor %} | ||
| </tr> | ||
| </thead> | ||
|
|
||
| <tbody> | ||
| {% for form in formset %} | ||
| {{ form.non_field_errors() }} | ||
| <tr> | ||
| {% for field in form %} | ||
| {% if not field.is_hidden %} | ||
| <td> | ||
| {{ field.errors }} | ||
| {% endif %} | ||
|
|
||
| {{ field }} | ||
|
|
||
| {% if not field.is_hidden %} | ||
| </td> | ||
| {% endif %} | ||
| {% endfor %} | ||
| </tr> | ||
| {% endfor %} | ||
| </tbody> | ||
| </table> | ||
|
|
||
| <input type="submit" value="{% trans %}Submit{% endtrans %}"/> | ||
| </form> | ||
| {% endblock %} |
This file was deleted.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I question, if hardcoding domains is good.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
In this case the line is kind of a fallback.
In case the user uses the [:wiki:] syntax, the usual css styling applies - or can we apply (we currently don't), with no hardcoded domain.
In case the user uses the generic link syntax (and "hardcodes" the domain), we can still apply the styling by hardcoding the domain too.