From ebaeec9438729fafdc96301355954241e69a0710 Mon Sep 17 00:00:00 2001 From: Santos Gallegos Date: Thu, 1 Feb 2018 20:49:07 -0500 Subject: [PATCH 1/7] Add edit and view docs buttons to subproject list --- .../projects/projectrelationship_list.html | 24 ++++++++++--------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/readthedocs/templates/projects/projectrelationship_list.html b/readthedocs/templates/projects/projectrelationship_list.html index a5aca6a2753..a6463d06d23 100644 --- a/readthedocs/templates/projects/projectrelationship_list.html +++ b/readthedocs/templates/projects/projectrelationship_list.html @@ -49,20 +49,22 @@ + + {% endif %} From 713f633c6f507b99735f4cba765d412dca616259 Mon Sep 17 00:00:00 2001 From: Santos Gallegos Date: Sat, 10 Feb 2018 11:35:00 -0500 Subject: [PATCH 3/7] Add style for subprojects list --- media/css/core.css | 45 ++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 42 insertions(+), 3 deletions(-) diff --git a/media/css/core.css b/media/css/core.css index da96520489b..fca3cc3a204 100644 --- a/media/css/core.css +++ b/media/css/core.css @@ -1124,11 +1124,50 @@ div.httpexchange div.highlight pre { } /* Subprojects */ -div.module.project-subprojects div.subproject-meta { - font-size: .9em; - font-style: italic; +div.module.project-subprojects div.subproject-info { + height: 2.625em; + overflow: hidden; +} + +div.module.project-subprojects div.subproject-info a.subproject-name { + line-height: 1.5em; + text-decoration: none; } +div.module.project-subprojects div.subproject-info span.subproject-url a { + display: block; + font-size: .75em; + line-height: 1.5em; + color: #999; + text-decoration: none; +} + +div.module.project-subprojects div.subproject-info ul.subproject-menu { + top: 10px; + right: 10px; +} + +div.module.project-subprojects li.subproject span.subproject-url a:before { + padding-right: .5em; + font-family: FontAwesome; + font-size: 1.2em; + content: "\f0c1"; +} + +div.module.project-subprojects li.subproject a.subproject-edit { + display: block; + height: 1em; + padding: .5em .75em; + font-size: 1em; + font-weight: normal; +} +div.module.project-subprojects li.subproject a.subproject-edit:before { + font-family: FontAwesome; + font-weight: normal; + content: "\f044"; +} + + /* Pygments */ div.highlight pre .hll { background-color: #ffffcc } div.highlight pre .c { color: #60a0b0; font-style: italic } /* Comment */ From 147145e1c0e8abd83a613e68f33f4344b95ec65c Mon Sep 17 00:00:00 2001 From: Santos Gallegos Date: Wed, 21 Feb 2018 18:23:03 -0500 Subject: [PATCH 4/7] More general layout --- .../projects/projectrelationship_list.html | 65 +++++++++---------- 1 file changed, 32 insertions(+), 33 deletions(-) diff --git a/readthedocs/templates/projects/projectrelationship_list.html b/readthedocs/templates/projects/projectrelationship_list.html index 08c6a59cdd9..da9d2e2a501 100644 --- a/readthedocs/templates/projects/projectrelationship_list.html +++ b/readthedocs/templates/projects/projectrelationship_list.html @@ -47,41 +47,40 @@
-
- -
+ + + {% empty %} +
  • +

    + {% trans 'No subprojects are currently configured' %} +

    +
    • + {% endfor %} +
    From 7a440f6a027f39fb1bd566fa36aa1a9d7ee4f685 Mon Sep 17 00:00:00 2001 From: Santos Gallegos Date: Wed, 21 Feb 2018 18:23:23 -0500 Subject: [PATCH 5/7] More general style --- media/css/core.css | 69 ++++++++++++++++++++++++++-------------------- 1 file changed, 39 insertions(+), 30 deletions(-) diff --git a/media/css/core.css b/media/css/core.css index fca3cc3a204..ce389843711 100644 --- a/media/css/core.css +++ b/media/css/core.css @@ -1068,6 +1068,43 @@ select.dropdown { display: none; } } +/* Table lists */ +div.module div.module-title { + height: 2.625em; + overflow: hidden; +} + +div.module div.module-list ul li.module-item div.module-title .module-name { + line-height: 1.5em; +} +div.module div.module-list ul li.module-item div.module-title a.module-name { + text-decoration: none; +} + +div.module div.module-list ul li.module-item div.module-title .module-info { + display: block; + font-size: .75em; + line-height: 1.5em; + color: #999; +} +div.module div.module-list ul li.module-item div.module-title a.module-info { + text-decoration: none; +} + +div.module div.module-title ul.module-item-menu { + top: 10px; + right: 10px; +} + +div.module div.module-list ul.module-item-menu a.module-action { + display: block; + height: 1em; + padding: .5em .75em; + font-size: 1em; + font-weight: normal; +} + + /* Domain Pages */ .domain-machine { color: #999; } @@ -1123,44 +1160,16 @@ div.httpexchange div.highlight pre { font-size: .9em; } -/* Subprojects */ -div.module.project-subprojects div.subproject-info { - height: 2.625em; - overflow: hidden; -} - -div.module.project-subprojects div.subproject-info a.subproject-name { - line-height: 1.5em; - text-decoration: none; -} -div.module.project-subprojects div.subproject-info span.subproject-url a { - display: block; - font-size: .75em; - line-height: 1.5em; - color: #999; - text-decoration: none; -} - -div.module.project-subprojects div.subproject-info ul.subproject-menu { - top: 10px; - right: 10px; -} +/* Subprojects */ -div.module.project-subprojects li.subproject span.subproject-url a:before { +div.module.project-subprojects li.subproject a.subproject-url:before { padding-right: .5em; font-family: FontAwesome; font-size: 1.2em; content: "\f0c1"; } -div.module.project-subprojects li.subproject a.subproject-edit { - display: block; - height: 1em; - padding: .5em .75em; - font-size: 1em; - font-weight: normal; -} div.module.project-subprojects li.subproject a.subproject-edit:before { font-family: FontAwesome; font-weight: normal; From f613c667df90db3da31335095b252083a3dfab69 Mon Sep 17 00:00:00 2001 From: Santos Gallegos Date: Wed, 21 Feb 2018 18:27:35 -0500 Subject: [PATCH 6/7] Change wrapper --- readthedocs/templates/projects/projectrelationship_list.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/readthedocs/templates/projects/projectrelationship_list.html b/readthedocs/templates/projects/projectrelationship_list.html index da9d2e2a501..1158525ddaf 100644 --- a/readthedocs/templates/projects/projectrelationship_list.html +++ b/readthedocs/templates/projects/projectrelationship_list.html @@ -45,8 +45,8 @@
    -
    -
    +
    +
      {% for subproject in object_list %}
    • From bdf4844d4c8a222d4d77cf0c90a244020a5479a6 Mon Sep 17 00:00:00 2001 From: Santos Gallegos Date: Tue, 6 Mar 2018 17:19:07 -0500 Subject: [PATCH 7/7] Add help class --- readthedocs/templates/projects/projectrelationship_list.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readthedocs/templates/projects/projectrelationship_list.html b/readthedocs/templates/projects/projectrelationship_list.html index 1158525ddaf..bc8b5dc9398 100644 --- a/readthedocs/templates/projects/projectrelationship_list.html +++ b/readthedocs/templates/projects/projectrelationship_list.html @@ -12,7 +12,7 @@ {% block project_edit_content_header %}{% trans "Subprojects" %}{% endblock %} {% block project_edit_content %} -

      +

      {% blocktrans trimmed %} Subprojects are projects hosted from the same URL as their parent project. This is useful for organizing multiple projects under a custom domain.