[gentoo-commits] proj/tinderbox-cluster-www:master commit in: python/templates/pages/packages/ebuilds/, python/templates/pages/packages/, ... - gentoo-commits

From:	Magnus Granberg <zorry@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] proj/tinderbox-cluster-www:master commit in: python/templates/pages/packages/ebuilds/, python/templates/pages/packages/, ...
Date:	Thu, 23 Jul 2015 13:56:40
Message-Id:	`1437659746.9a6e27cb6c11138eee1af77491d4ac3cd42b3afd.zorry@gentoo`

1

commit:     9a6e27cb6c11138eee1af77491d4ac3cd42b3afd

2

Author:     Magnus Granberg <zorry <AT> gentoo <DOT> org>

3

AuthorDate: Thu Jul 23 13:55:46 2015 +0000

4

Commit:     Magnus Granberg <zorry <AT> gentoo <DOT> org>

5

CommitDate: Thu Jul 23 13:55:46 2015 +0000

6

URL:        https://gitweb.gentoo.org/proj/tinderbox-cluster-www.git/commit/?id=9a6e27cb

7

8

fix more rows for packages

9

10

 .../templates/pages/packages/category/index.html   | 40 +++++++++++++---------

11

 python/templates/pages/packages/ebuilds/index.html |  2 --

12

 python/templates/pages/packages/index.html         | 37 ++++++++++++--------

13

 3 files changed, 45 insertions(+), 34 deletions(-)

14

15

diff --git a/python/templates/pages/packages/category/index.html b/python/templates/pages/packages/category/index.html

16

index 34c1426..edc7cc9 100644

17

--- a/python/templates/pages/packages/category/index.html

18

+++ b/python/templates/pages/packages/category/index.html

19

@@ -1,23 +1,29 @@

20

 {% extends "layout/base.html" %}

21

 {% block content %}

22

 <div class="row">

23

-  <div class="col-xs-12 col-md-6">

24

-    <h2>Packages in {{ C.Category }}</h2>

25

-    <table class="table table-striped frontpage-table">

26

-  {% for key, PM in PM_tmp.items %}

27

-    <tr>

28

-      <td class="frontpage-table-package-atom">

29

-        <a href="/package/{{ PM.PackageId }}/" title="{{ C.Category }}/{{ key }}">{{ C.Category }}/{{ key }}</a>

30

-        <p title="{{ PM.Changlog }}">Changlog</p>

31

-      </td>

32

-      <td>

33

-        <p title="{{ PM.Descriptions }}">{{ PM.Descriptions }}</p>

34

-        <p title="{% for P in PM.Ebuilds %}{{ key }}/{{ P }}{% endfor %}">Versions</p>

35

-      </td>

36

-    </tr>

37

-  {% endfor %}

38

-</table>

39

-  </div>

40

+  <h2>Packages in {{ C.Category }}</h2>

41

+  <div class="col-xs-12 col-md-5">

42

+    {% for key, PM in PM_tmp.items %}

43

+      <table class="table table-striped frontpage-table">

44

+        <tr>

45

+          <td class="frontpage-table-package-atom">

46

+            <a href="/package/{{ PM.PackageId }}/" title="{{ C.Category }}/{{ key }}">{{ C.Category }}/{{ key }}</a>

47

+            <p title="{{ PM.Changlog }}">Changlog</p>

48

+          </td>

49

+          <td>

50

+            <p title="{{ PM.Descriptions }}">{{ PM.Descriptions }}</p>

51

+            <p title="{% for P in PM.Ebuilds %}{{ key }}/{{ P }}{% endfor %}">Versions</p>

52

+          </td>

53

+        </tr>

54

+      </table>

55

+      {% if forloop.last %}

56

+        </div>

57

+      {% else %}

58

+        {% if forloop.counter|divisibleby:"2" %}

59

+          </div><div class="col-xs-12 col-md-5">

60

+        {% endif %}

61

+      {% endif %}

62

+    {% endfor %}

63

 </div>

64

65

 {% endblock %}

66

\ No newline at end of file

67

68

diff --git a/python/templates/pages/packages/ebuilds/index.html b/python/templates/pages/packages/ebuilds/index.html

69

index 1e034d4..f8e1b4e 100644

70

--- a/python/templates/pages/packages/ebuilds/index.html

71

+++ b/python/templates/pages/packages/ebuilds/index.html

72

@@ -11,7 +11,6 @@

73

           <td class="frontpage-table-package-atom">

74

             <a href="/ebuild/{{ E.EbuildId.EbuildId }}/" title="{{ P.PackageId.CategoryId.Category }}/{{ P.PackageId.Package }}-{{ E.EbuildId.Version }}::{{ E.EbuildId.PackageId.RepoId.Repo }}">{{ P.PackageId.Package }}-{{ E.EbuildId.Version }}::{{ E.EbuildId.PackageId.RepoId.Repo }}</a></td>

75

           <td>

76

-             <td class="text-right">

77

               {% for K in EK_tmp %}

78

                 {% if K.EbuildId.EbuildId == E.EbuildId.EbuildId  and K.KeywordId.Keyword != '*' %}

79

                   {% if K.Status == 'Stable' %}<span class="label label-success">{{ K.KeywordId.Keyword }}</span>{% endif %}

80

@@ -19,7 +18,6 @@

81

                   {% if K.Status == 'Negative' %}{{ K.KeywordId.Keyword }}{% endif %}

82

                 {% endif %}

83

               {% endfor %}

84

-            </td>

85

           </td>

86

         </tr>

87

       {% endfor %}

88

89

diff --git a/python/templates/pages/packages/index.html b/python/templates/pages/packages/index.html

90

index 82ccf59..5e02552 100644

91

--- a/python/templates/pages/packages/index.html

92

+++ b/python/templates/pages/packages/index.html

93

@@ -1,21 +1,28 @@

94

 {% extends "layout/base.html" %}

95

 {% block content %}

96

 <div class="row">

97

-  <div class="col-xs-12 col-md-6">

98

-    <h2>Categories</h2>

99

-    <table class="table table-striped frontpage-table">

100

-  {% for key, CM in CM_tmp.items %}

101

-    <tr>

102

-      <td class="frontpage-table-package-atom">

103

-      <a href="/categories/{{ CM.CategoryId }}/" title="{{ key }}">{{ key }}</a></td>

104

-      <td>

105

-      <p title="{{ CM.Descriptions }}">{{ CM.Descriptions }}</p>

106

-      <p title="{% for P in CM.Packages %}{{ key }}/{{ P }}{% endfor %}">Packages</p> 

107

-      </td>

108

-    </tr>

109

-  {% endfor %}

110

-</table>

111

-  </div>

112

+<h2>Categories</h2>

113

+  <div class="col-xs-8 col-md-4">

114

+    {% for key, CM in CM_tmp.items %}

115

+      <table class="table table-striped frontpage-table">

116

+        <tr>

117

+          <td class="frontpage-table-package-atom">

118

+            <a href="/categories/{{ CM.CategoryId }}/" title="{{ key }}">{{ key }}</a>

119

+          </td>

120

+          <td>

121

+            <p title="{{ CM.Descriptions }}">{{ CM.Descriptions }}</p>

122

+            <p title="{% for P in CM.Packages %}{{ key }}/{{ P }}{% endfor %}">Packages</p> 

123

+          </td>

124

+        </tr>

125

+      </table>

126

+      {% if forloop.last %}

127

+        </div>

128

+      {% else %}

129

+        {% if forloop.counter|divisibleby:"2" %}

130

+          </div><div class="col-xs-8 col-md-4">

131

+        {% endif %}

132

+      {% endif %}

133

+    {% endfor %}

134

 </div>

135

136

 {% endblock %}

137

\ No newline at end of file

1	commit: 9a6e27cb6c11138eee1af77491d4ac3cd42b3afd
2	Author: Magnus Granberg <zorry <AT> gentoo <DOT> org>
3	AuthorDate: Thu Jul 23 13:55:46 2015 +0000
4	Commit: Magnus Granberg <zorry <AT> gentoo <DOT> org>
5	CommitDate: Thu Jul 23 13:55:46 2015 +0000
6	URL: https://gitweb.gentoo.org/proj/tinderbox-cluster-www.git/commit/?id=9a6e27cb
7
8	fix more rows for packages
9
10	.../templates/pages/packages/category/index.html \| 40 +++++++++++++---------
11	python/templates/pages/packages/ebuilds/index.html \| 2 --
12	python/templates/pages/packages/index.html \| 37 ++++++++++++--------
13	3 files changed, 45 insertions(+), 34 deletions(-)
14
15	diff --git a/python/templates/pages/packages/category/index.html b/python/templates/pages/packages/category/index.html
16	index 34c1426..edc7cc9 100644
17	--- a/python/templates/pages/packages/category/index.html
18	+++ b/python/templates/pages/packages/category/index.html
19	@@ -1,23 +1,29 @@
20	{% extends "layout/base.html" %}
21	{% block content %}
22	<div class="row">
23	- <div class="col-xs-12 col-md-6">
24	- <h2>Packages in {{ C.Category }}</h2>
25	- <table class="table table-striped frontpage-table">
26	- {% for key, PM in PM_tmp.items %}
27	- <tr>
28	- <td class="frontpage-table-package-atom">
29	- <a href="/package/{{ PM.PackageId }}/" title="{{ C.Category }}/{{ key }}">{{ C.Category }}/{{ key }}</a>
30	- <p title="{{ PM.Changlog }}">Changlog</p>
31	- </td>
32	- <td>
33	- <p title="{{ PM.Descriptions }}">{{ PM.Descriptions }}</p>
34	- <p title="{% for P in PM.Ebuilds %}{{ key }}/{{ P }}{% endfor %}">Versions</p>
35	- </td>
36	- </tr>
37	- {% endfor %}
38	-</table>
39	- </div>
40	+ <h2>Packages in {{ C.Category }}</h2>
41	+ <div class="col-xs-12 col-md-5">
42	+ {% for key, PM in PM_tmp.items %}
43	+ <table class="table table-striped frontpage-table">
44	+ <tr>
45	+ <td class="frontpage-table-package-atom">
46	+ <a href="/package/{{ PM.PackageId }}/" title="{{ C.Category }}/{{ key }}">{{ C.Category }}/{{ key }}</a>
47	+ <p title="{{ PM.Changlog }}">Changlog</p>
48	+ </td>
49	+ <td>
50	+ <p title="{{ PM.Descriptions }}">{{ PM.Descriptions }}</p>
51	+ <p title="{% for P in PM.Ebuilds %}{{ key }}/{{ P }}{% endfor %}">Versions</p>
52	+ </td>
53	+ </tr>
54	+ </table>
55	+ {% if forloop.last %}
56	+ </div>
57	+ {% else %}
58	+ {% if forloop.counter\|divisibleby:"2" %}
59	+ </div><div class="col-xs-12 col-md-5">
60	+ {% endif %}
61	+ {% endif %}
62	+ {% endfor %}
63	</div>
64
65	{% endblock %}
66	\ No newline at end of file
67
68	diff --git a/python/templates/pages/packages/ebuilds/index.html b/python/templates/pages/packages/ebuilds/index.html
69	index 1e034d4..f8e1b4e 100644
70	--- a/python/templates/pages/packages/ebuilds/index.html
71	+++ b/python/templates/pages/packages/ebuilds/index.html
72	@@ -11,7 +11,6 @@
73	<td class="frontpage-table-package-atom">
74	<a href="/ebuild/{{ E.EbuildId.EbuildId }}/" title="{{ P.PackageId.CategoryId.Category }}/{{ P.PackageId.Package }}-{{ E.EbuildId.Version }}::{{ E.EbuildId.PackageId.RepoId.Repo }}">{{ P.PackageId.Package }}-{{ E.EbuildId.Version }}::{{ E.EbuildId.PackageId.RepoId.Repo }}</a></td>
75	<td>
76	- <td class="text-right">
77	{% for K in EK_tmp %}
78	{% if K.EbuildId.EbuildId == E.EbuildId.EbuildId and K.KeywordId.Keyword != '*' %}
79	{% if K.Status == 'Stable' %}<span class="label label-success">{{ K.KeywordId.Keyword }}</span>{% endif %}
80	@@ -19,7 +18,6 @@
81	{% if K.Status == 'Negative' %}{{ K.KeywordId.Keyword }}{% endif %}
82	{% endif %}
83	{% endfor %}
84	- </td>
85	</td>
86	</tr>
87	{% endfor %}
88
89	diff --git a/python/templates/pages/packages/index.html b/python/templates/pages/packages/index.html
90	index 82ccf59..5e02552 100644
91	--- a/python/templates/pages/packages/index.html
92	+++ b/python/templates/pages/packages/index.html
93	@@ -1,21 +1,28 @@
94	{% extends "layout/base.html" %}
95	{% block content %}
96	<div class="row">
97	- <div class="col-xs-12 col-md-6">
98	- <h2>Categories</h2>
99	- <table class="table table-striped frontpage-table">
100	- {% for key, CM in CM_tmp.items %}
101	- <tr>
102	- <td class="frontpage-table-package-atom">
103	- <a href="/categories/{{ CM.CategoryId }}/" title="{{ key }}">{{ key }}</a></td>
104	- <td>
105	- <p title="{{ CM.Descriptions }}">{{ CM.Descriptions }}</p>
106	- <p title="{% for P in CM.Packages %}{{ key }}/{{ P }}{% endfor %}">Packages</p>
107	- </td>
108	- </tr>
109	- {% endfor %}
110	-</table>
111	- </div>
112	+<h2>Categories</h2>
113	+ <div class="col-xs-8 col-md-4">
114	+ {% for key, CM in CM_tmp.items %}
115	+ <table class="table table-striped frontpage-table">
116	+ <tr>
117	+ <td class="frontpage-table-package-atom">
118	+ <a href="/categories/{{ CM.CategoryId }}/" title="{{ key }}">{{ key }}</a>
119	+ </td>
120	+ <td>
121	+ <p title="{{ CM.Descriptions }}">{{ CM.Descriptions }}</p>
122	+ <p title="{% for P in CM.Packages %}{{ key }}/{{ P }}{% endfor %}">Packages</p>
123	+ </td>
124	+ </tr>
125	+ </table>
126	+ {% if forloop.last %}
127	+ </div>
128	+ {% else %}
129	+ {% if forloop.counter\|divisibleby:"2" %}
130	+ </div><div class="col-xs-8 col-md-4">
131	+ {% endif %}
132	+ {% endif %}
133	+ {% endfor %}
134	</div>
135
136	{% endblock %}
137	\ No newline at end of file

Gentoo Archives: gentoo-commits