aboutsummaryrefslogtreecommitdiff
path: root/web/views
diff options
context:
space:
mode:
authorJochen Topf <jochen@topf.org>2014-09-06 20:37:13 +0200
committerJochen Topf <jochen@topf.org>2014-09-06 20:37:13 +0200
commita841bf2f35bfe477db2458533b8a875cd9cf38e8 (patch)
tree2ab19aef5c06c65f09d7d5e7406918d6ffc30b9b /web/views
parent95ff801f4829046ca44f949beddb56b066768466 (diff)
downloadtaginfo-a841bf2f35bfe477db2458533b8a875cd9cf38e8.tar
taginfo-a841bf2f35bfe477db2458533b8a875cd9cf38e8.tar.gz
Refactor projects code to work without the Project class.
This way we always get the data dynamically from the database instead of loading it once at program start. This could allow faster updates in the future.
Diffstat (limited to 'web/views')
-rw-r--r--web/views/project.erb20
-rw-r--r--web/views/taginfo/projects.erb32
2 files changed, 26 insertions, 26 deletions
diff --git a/web/views/project.erb b/web/views/project.erb
index faab181..877ff81 100644
--- a/web/views/project.erb
+++ b/web/views/project.erb
@@ -1,6 +1,6 @@
<div class="pre">
- <h1><%= h(@project.name) %></h1>
- <p><%= h(@project.description) %></p>
+ <h1><%= h(@project['name']) %></h1>
+ <p><%= h(@project['description']) %></p>
</div>
<div id="tabs">
<ul class="no-print">
@@ -9,13 +9,13 @@
</ul>
<div id="overview">
<table class="desc">
- <tr><th><%= h(t.pages.project.overview.project_name) %>:</th><td><span id="icon_url"></span> <%= h(@project.name) %></td></tr>
+ <tr><th><%= h(t.pages.project.overview.project_name) %>:</th><td><span id="icon_url"></span> <%= h(@project['name']) %></td></tr>
<tr><th><%= h(t.pages.project.overview.project_url) %>:</th><td id="project_url"></td></tr>
- <tr><th><%= h(t.pages.project.overview.description) %>:</th><td><%= h(@project.description) %></td></tr>
-<% if @project.doc_url %>
+ <tr><th><%= h(t.pages.project.overview.description) %>:</th><td><%= h(@project['description']) %></td></tr>
+<% if @project['doc_url'] %>
<tr><th><%= h(t.pages.project.overview.documentation_url) %>:</th><td id="doc_url"></td></tr>
<% end %>
- <tr><th><%= h(t.pages.project.overview.last_update) %>:</th><td><%= h(@project.data_updated) %></td></tr>
+ <tr><th><%= h(t.pages.project.overview.last_update) %>:</th><td><%= h(@project['data_updated']) %></td></tr>
<tr><th><%= h(t.pages.project.overview.json_url) %>:</th><td id="json_url"></td></tr>
</table>
<p><i><%= t.pages.project.overview.info %></i></p>
@@ -31,10 +31,10 @@
JS.raw(<<"JAVASCRIPT")
function page_init2() {
var project = #{ @project_id.to_json },
- project_url = #{ @project.project_url.to_json },
- json_url = #{ @project.json_url.to_json },
- icon_url = #{ @project.icon_url.to_json },
- doc_url = #{ @project.doc_url.to_json };
+ project_url = #{ @project['project_url'].to_json },
+ json_url = #{ @project['json_url'].to_json },
+ icon_url = #{ @project['icon_url'].to_json },
+ doc_url = #{ @project['doc_url'].to_json };
if (project_url) {
jQuery('#project_url').html(link_to_url(project_url));
diff --git a/web/views/taginfo/projects.erb b/web/views/taginfo/projects.erb
index dd07ed6..dda4111 100644
--- a/web/views/taginfo/projects.erb
+++ b/web/views/taginfo/projects.erb
@@ -1,4 +1,4 @@
-<h1 class="section">Projects</h1>
+<h1 class="section"><%= h(t.taginfo.projects) %></h1>
<table class="list">
<tr>
@@ -9,32 +9,32 @@
<th>Project URL<br/>Doc URL</th><th>Contact</th>
<th>Description</th>
</tr>
-<% Project.each_with_index do |project, n| c = (n%2!=0) ? ' even' : '' %>
+<% @projects.each_with_index do |project, n| c = (n%2!=0) ? ' even' : '' %>
<tr>
<td class="tc<%= c %> nowrap">
- <img src="<%= h(project.icon_url) %>" width="16" height="16" alt=""/>
+ <img src="<%= h(project['icon_url']) %>" width="16" height="16" alt=""/>
</td>
<td class="<%= c %> nowrap">
- <a href="/projects/<%= h(project.id) %>"><%= h(project.id) %></a><br/>
- <%= h(project.name) %>
+ <a href="/projects/<%= h(project['id']) %>"><%= h(project['id']) %></a><br/>
+ <%= h(project['name']) %>
</td>
<td class="<%= c %> nowrap">
- <%= h(project.fetch_date) %><br/>
- <%= h(project.data_updated) %>
+ <%= h(project['fetch_date']) %><br/>
+ <%= h(project['data_updated']) %>
</td>
- <td class="tc<%= c %> nowrap"><%= h(project.fetch_status) %></td>
- <td class="tc<%= c %> nowrap"><%= h(project.fetch_result) %></td>
+ <td class="tc<%= c %> nowrap"><%= h(project['fetch_status']) %></td>
+ <td class="tc<%= c %> nowrap"><%= h(project['fetch_result']) %></td>
<td class="<%= c %> nowrap">
- <a href="<%= h(project.json_url) %>"><%= h(project.json_url) %></a><br/>
- <a href="<%= h(project.data_url) %>"><%= h(project.data_url) %></a>
+ <a href="<%= h(project['json_url']) %>"><%= h(project['json_url']) %></a><br/>
+ <a href="<%= h(project['data_url']) %>"><%= h(project['data_url']) %></a>
</td>
- <td class="tc<%= c %> nowrap"><%= h(project.data_format) %></td>
+ <td class="tc<%= c %> nowrap"><%= h(project['data_format']) %></td>
<td class="<%= c %> nowrap">
- <a href="<%= h(project.project_url) %>"><%= h(project.project_url) %></a><br/>
- <a href="<%= h(project.doc_url) %>"><%= h(project.doc_url) %></a>
+ <a href="<%= h(project['project_url']) %>"><%= h(project['project_url']) %></a><br/>
+ <a href="<%= h(project['doc_url']) %>"><%= h(project['doc_url']) %></a>
</td>
- <td class="<%= c %> nowrap"><%= h(project.contact_name) %><br/><%= h(project.contact_email) %></td>
- <td class="<%= c %>"><%= h(project.description) %></td>
+ <td class="<%= c %> nowrap"><%= h(project['contact_name']) %><br/><%= h(project['contact_email']) %></td>
+ <td class="<%= c %>"><%= h(project['description']) %></td>
</tr>
<% end %>
</table>