Commit f9e529e6 authored by Roque's avatar Roque

Project dashboard improvements

See merge request !1553
parents 1b487f8c f903d483
......@@ -92,6 +92,15 @@ div[data-gadget-url$="gadget_erp5_page_project_front_page.html"] .front-project-
margin-bottom: 8px;
}
div[data-gadget-url$="gadget_erp5_page_project_front_page.html"] .front-project-list .project-box .project-title a {
color: #267B87;
font-weight: normal;
font-size: 14px;
line-height: 33px;
margin-bottom: 8px;
margin-left: 14px;
}
div[data-gadget-url$="gadget_erp5_page_project_front_page.html"] .front-project-list .project-box span.margined {
margin-right: 5px;
}
......
......@@ -242,7 +242,7 @@
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>982.36779.34422.1348</string> </value>
<value> <string>998.5120.55627.52002</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -260,7 +260,7 @@
</tuple>
<state>
<tuple>
<float>1584457148.55</float>
<float>1644420658.08</float>
<string>UTC</string>
</tuple>
</state>
......
......@@ -301,11 +301,15 @@
function createProjectHtmlElement(project_id, project_title,
project_url, supervisor, supervisor_url) {
var project_link = domsugar('a', {
href: project_url
}, [project_title]),
//title_div will have 2 elements: span (with title text) and a link (with text "Project Page")
//update styles: " div[data-gadget-url$="gadget_erp5_page_project_front_page.html"] a" to be a smaller text
var project_title_span = domsugar('span', {}, [project_title]),
project_link = domsugar('a', {
href: project_url,
id: project_title + "-project_page_link"
}, ["(Project Page)"]),
title_div = domsugar('div', { class: "project-title" },
[project_link]),
[project_title_span, project_link]),
left_info_div = domsugar('div', { class: "project-left" }),
supervisor_field_label = domsugar('label', {}, [SUPERVISOR_FIELD_TITLE]),
supervisor_value_link = domsugar('a', {
......@@ -562,6 +566,7 @@
})
.declareJob("detachRenderProjectForumLink", function () {
return;
var gadget = this,
i,
forum_link_html,
......
......@@ -234,7 +234,7 @@
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>982.41488.58477.39116</string> </value>
<value> <string>998.5123.35694.4864</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -252,7 +252,7 @@
</tuple>
<state>
<tuple>
<float>1584697605.84</float>
<float>1644428660.52</float>
<string>UTC</string>
</tuple>
</state>
......
......@@ -92,12 +92,17 @@
<!-- Check project present -->
<tr>
<td>assertElementPresent</td>
<td>//div[@class='front-project-list']//div[@class='project-title']//a[text()='test-project']</td>
<td>//div[@class='front-project-list']//div[@class='project-title']//span[text()='test-project']</td>
<td></td>
</tr>
<tr>
<td>assertElementPresent</td>
<td>//div[@class='front-project-list']//div[@class='project-title']//a[text()='(Project Page)']</td>
<td></td>
</tr>
<tr>
<td>click</td>
<td>//div[@class='front-project-list']//div[@class='project-title']//a[text()='test-project']</td>
<td>//div[@class='front-project-list']//div[@class='project-title']//a[text()='(Project Page)']</td>
<td></td>
</tr>
<!-- check project quick view page elements -->
......
......@@ -66,13 +66,13 @@
<!-- Check draft project -->
<tr>
<td>assertElementNotPresent</td>
<td>//div[@class='front-project-list']//div[@class='project-title']//a[text()='draft-project']</td>
<td>//div[@class='front-project-list']//div[@class='project-title']//span[text()='draft-project']</td>
<td></td>
</tr>
<!-- Check empty project -->
<tr>
<td>assertElementPresent</td>
<td>//div[@class='front-project-list']//div[@class='project-title']//a[text()='empty-project']</td>
<td>//div[@class='front-project-list']//div[@class='project-title']//span[text()='empty-project']</td>
<td></td>
</tr>
<!-- Check empty Task line -->
......@@ -158,12 +158,12 @@
<!-- Check documented project -->
<tr>
<td>assertElementPresent</td>
<td>//div[@class='front-project-list']//div[@class='project-title']//a[text()='documented-project']</td>
<td>//div[@class='front-project-list']//div[@class='project-title']//span[text()='documented-project']</td>
<td></td>
</tr>
<!-- Check Task line -->
<tr>
<td>assertElementPresent</td>
<td>waitForElementPresent</td>
<td>//div[@class='front-project-list']//div[@class='project-line']//span[@class='status none margined green' and contains(@id, 'documented-project') and contains(@id, 'Task') and contains(@id, '-status')]</td>
<td></td>
</tr>
......@@ -266,16 +266,16 @@
<td>//div[@class='front-project-list']//div[@class='project-line']//span[contains(@id, 'documented-project') and contains(@id, 'Task-Report') and contains(@id, '-outdated') and text()='0']</td>
<td></td>
</tr>
<!-- Check Forum link -->
<!-- Check Forum link
<tr>
<td>assertElementPresent</td>
<td>//div[@class='front-project-list']//div[@class='project-right']//a[contains(@id, 'documented-project') and contains(@id, 'link-forum') and @href='test-forum-link' and text()='Project Forum']</td>
<td></td>
</tr>
</tr> -->
<!-- Check failed project -->
<tr>
<td>assertElementPresent</td>
<td>//div[@class='front-project-list']//div[@class='project-title']//a[text()='failed-project']</td>
<td>//div[@class='front-project-list']//div[@class='project-title']//span[text()='failed-project']</td>
<td></td>
</tr>
<tr>
......
......@@ -55,12 +55,17 @@
<!-- Check project present -->
<tr>
<td>assertElementPresent</td>
<td>//div[@class='front-project-list']//div[@class='project-title']//a[text()='test-project-home']</td>
<td>//div[@class='front-project-list']//div[@class='project-title']//span[text()='test-project-home']</td>
<td></td>
</tr>
<tr>
<td>assertElementPresent</td>
<td>//div[@class='front-project-list']//div[@class='project-title']//a[@id='test-project-home-project_page_link' and text()='(Project Page)']</td>
<td></td>
</tr>
<tr>
<td>click</td>
<td>//div[@class='front-project-list']//div[@class='project-title']//a[text()='test-project-home']</td>
<td>//div[@class='front-project-list']//div[@class='project-title']//a[@id='test-project-home-project_page_link' and text()='(Project Page)']</td>
<td></td>
</tr>
<!-- check project quick view page elements -->
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment