[25000] users/jberry/mpwa/app
source_changes at macosforge.org
source_changes at macosforge.org
Thu May 10 21:11:07 PDT 2007
Revision: 25000
http://trac.macosforge.org/projects/macports/changeset/25000
Author: jberry at macports.org
Date: 2007-05-10 21:11:06 -0700 (Thu, 10 May 2007)
Log Message:
-----------
mpwa: some interface touchups
Modified Paths:
--------------
users/jberry/mpwa/app/controllers/application.rb
users/jberry/mpwa/app/controllers/mac_ports_controller.rb
users/jberry/mpwa/app/controllers/port_controller.rb
users/jberry/mpwa/app/controllers/tag_controller.rb
users/jberry/mpwa/app/helpers/table_helper.rb
users/jberry/mpwa/app/models/tag.rb
users/jberry/mpwa/app/models/variant.rb
users/jberry/mpwa/app/views/mac_ports/show.rhtml
users/jberry/mpwa/app/views/person/show.rhtml
users/jberry/mpwa/app/views/port/list.rhtml
users/jberry/mpwa/app/views/port/show.rhtml
users/jberry/mpwa/app/views/port_pkg/show.rhtml
users/jberry/mpwa/app/views/port_pkg_file/show.rhtml
users/jberry/mpwa/app/views/tag/show.rhtml
Modified: users/jberry/mpwa/app/controllers/application.rb
===================================================================
--- users/jberry/mpwa/app/controllers/application.rb 2007-05-11 03:59:55 UTC (rev 24999)
+++ users/jberry/mpwa/app/controllers/application.rb 2007-05-11 04:11:06 UTC (rev 25000)
@@ -6,6 +6,8 @@
attr_reader :repo_url, :repo_root, :repo_portpkgs, :repo_portpkgs_url
attr_reader :main_tags
+ helper :table
+
def initialize
@svn = "/opt/local/bin/svn"
@xar = "/opt/local/bin/xar"
Modified: users/jberry/mpwa/app/controllers/mac_ports_controller.rb
===================================================================
--- users/jberry/mpwa/app/controllers/mac_ports_controller.rb 2007-05-11 03:59:55 UTC (rev 24999)
+++ users/jberry/mpwa/app/controllers/mac_ports_controller.rb 2007-05-11 04:11:06 UTC (rev 25000)
@@ -1,6 +1,4 @@
class MacPortsController < ApplicationController
- helper :table
-
def index
render :action => 'show'
end
Modified: users/jberry/mpwa/app/controllers/port_controller.rb
===================================================================
--- users/jberry/mpwa/app/controllers/port_controller.rb 2007-05-11 03:59:55 UTC (rev 24999)
+++ users/jberry/mpwa/app/controllers/port_controller.rb 2007-05-11 04:11:06 UTC (rev 25000)
@@ -1,7 +1,5 @@
class PortController < ApplicationController
- helper :table
-
def index
list
render :action => 'list'
@@ -12,7 +10,7 @@
:redirect_to => { :action => :list }
def list
- @port_pages, @ports = paginate :ports, :per_page => 40, :order => 'name'
+ @port_pages, @ports = paginate :ports, :per_page => 80, :order => 'name'
end
def show
Modified: users/jberry/mpwa/app/controllers/tag_controller.rb
===================================================================
--- users/jberry/mpwa/app/controllers/tag_controller.rb 2007-05-11 03:59:55 UTC (rev 24999)
+++ users/jberry/mpwa/app/controllers/tag_controller.rb 2007-05-11 04:11:06 UTC (rev 25000)
@@ -1,7 +1,5 @@
class TagController < ApplicationController
- helper :table
-
def index
list
render :action => 'list'
Modified: users/jberry/mpwa/app/helpers/table_helper.rb
===================================================================
--- users/jberry/mpwa/app/helpers/table_helper.rb 2007-05-11 03:59:55 UTC (rev 24999)
+++ users/jberry/mpwa/app/helpers/table_helper.rb 2007-05-11 04:11:06 UTC (rev 25000)
@@ -7,8 +7,10 @@
# Turn the array into a series of rows and columns
len = a.length
+ return a if len == 0
+
rcnt = (len + ccnt - 1) / ccnt
-
+
if rowMajor
cols = []
a.each_slice(rcnt) do |s|
Modified: users/jberry/mpwa/app/models/tag.rb
===================================================================
--- users/jberry/mpwa/app/models/tag.rb 2007-05-11 03:59:55 UTC (rev 24999)
+++ users/jberry/mpwa/app/models/tag.rb 2007-05-11 04:11:06 UTC (rev 25000)
@@ -1,4 +1,8 @@
class Tag < ActiveRecord::Base
has_and_belongs_to_many :ports
has_and_belongs_to_many :port_pkgs
+
+ def <=>(other)
+ self.name <=> other.name
+ end
end
Modified: users/jberry/mpwa/app/models/variant.rb
===================================================================
--- users/jberry/mpwa/app/models/variant.rb 2007-05-11 03:59:55 UTC (rev 24999)
+++ users/jberry/mpwa/app/models/variant.rb 2007-05-11 04:11:06 UTC (rev 25000)
@@ -1,3 +1,8 @@
class Variant < ActiveRecord::Base
belongs_to :port_pkg
+
+ def <=>(other)
+ self.name <=> other.name
+ end
+
end
Modified: users/jberry/mpwa/app/views/mac_ports/show.rhtml
===================================================================
--- users/jberry/mpwa/app/views/mac_ports/show.rhtml 2007-05-11 03:59:55 UTC (rev 24999)
+++ users/jberry/mpwa/app/views/mac_ports/show.rhtml 2007-05-11 04:11:06 UTC (rev 25000)
@@ -4,7 +4,7 @@
<% for row in columnize(@main_tags.sort, 6) %>
<tr>
<% for tag in row %>
- <td><%= link_to tag, :controller => 'tag', :action => 'show', :name => tag if !tag.nil? %></td>
+ <td><%= link_to tag, :controller => 'tag', :action => 'show', :name => tag if tag %></td>
<% end %>
</tr>
<% end %>
Modified: users/jberry/mpwa/app/views/person/show.rhtml
===================================================================
--- users/jberry/mpwa/app/views/person/show.rhtml 2007-05-11 03:59:55 UTC (rev 24999)
+++ users/jberry/mpwa/app/views/person/show.rhtml 2007-05-11 04:11:06 UTC (rev 25000)
@@ -5,18 +5,24 @@
<% end %>
<h4>Ports</h4>
-<p>
- <% for port in @person.ports %>
- <%= link_to port.name, :controller => 'port', :action => 'show', :id => port %><br />
+<table>
+ <% for row in columnize(@person.ports.sort, 4) %>
+ <tr>
+ <% for port in row %>
+ <td><%= link_to port.name, :controller => 'port', :action => 'show', :id => port if port %></td>
+ <% end %>
+ </tr>
<% end %>
-</p>
+</table>
+
<h4>Packages</h4>
-<p>
- <% for pkg in @person.port_pkgs %>
- <%= link_to pkg.id, :controller => 'port_pkg', :action => 'show', :id => pkg %><br />
+<table>
+ <% for row in columnize(@person.port_pkgs.sort, 16) %>
+ <tr>
+ <% for pkg in row %>
+ <td><%= link_to pkg.id, :controller => 'port_pkg', :action => 'show', :id => pkg if pkg %></td>
+ <% end %>
+ </tr>
<% end %>
-</p>
-
-<%= link_to 'Edit', :action => 'edit', :id => @person %> |
-<%= link_to 'Back', :action => 'list' %>
+</table>
Modified: users/jberry/mpwa/app/views/port/list.rhtml
===================================================================
--- users/jberry/mpwa/app/views/port/list.rhtml 2007-05-11 03:59:55 UTC (rev 24999)
+++ users/jberry/mpwa/app/views/port/list.rhtml 2007-05-11 04:11:06 UTC (rev 25000)
@@ -1,10 +1,12 @@
<h2>Listing ports</h2>
-
<table>
- <tr><th>Port</th></tr>
- <% for port in @ports %>
- <tr><td><%= link_to port.name, :action => 'show', :id => port %></td></tr>
- <% end %>
+ <% for row in columnize(@ports.sort, 4) %>
+ <tr>
+ <% for port in row %>
+ <td><%= link_to port.name, :controller => 'port', :action => 'show', :id => port if !port.nil? %></td>
+ <% end %>
+ </tr>
+ <% end %>
</table>
<%= link_to 'Previous page', { :page => @port_pages.current.previous } if @port_pages.current.previous %>
Modified: users/jberry/mpwa/app/views/port/show.rhtml
===================================================================
--- users/jberry/mpwa/app/views/port/show.rhtml 2007-05-11 03:59:55 UTC (rev 24999)
+++ users/jberry/mpwa/app/views/port/show.rhtml 2007-05-11 04:11:06 UTC (rev 25000)
@@ -5,18 +5,18 @@
<%= simple_format(word_wrap(@port.long_desc)) %>
-<p><b>Home Page:</b> <%= auto_link @port.home_page %></p>
+<p><strong>Home Page:</strong> <%= auto_link @port.home_page %></p>
<p>
- <b>Maintainers:</b>
+ <strong>Maintainers:</strong>
<% for maintainer in @port.maintainers %>
<%= link_to maintainer.user_name, :controller => 'person', :action => 'show', :id => maintainer %>
<% end %>
</p>
<p>
- <b>Tags</b>
- <% for tag in @port.tags %>
+ <strong>Tags:</strong>
+ <% for tag in @port.tags.sort %>
<%= link_to tag.name, :controller => 'tag', :action => 'show', :id => tag %>
<% end %>
</p>
@@ -28,7 +28,7 @@
<th>Submitter</th>
<th>Submission Date</th>
</tr>
- <% for pkg in @port.port_pkgs %>
+ <% for pkg in @port.port_pkgs.sort %>
<tr>
<td><%= link_to pkg.id, :controller => 'port_pkg', :action => 'show', :id => pkg %></td>
<td><%= link_to pkg.submitter.user_name, :controller => 'person', :action => 'show',
Modified: users/jberry/mpwa/app/views/port_pkg/show.rhtml
===================================================================
--- users/jberry/mpwa/app/views/port_pkg/show.rhtml 2007-05-11 03:59:55 UTC (rev 24999)
+++ users/jberry/mpwa/app/views/port_pkg/show.rhtml 2007-05-11 04:11:06 UTC (rev 25000)
@@ -1,22 +1,39 @@
-<% for column in PortPkg.content_columns %>
+<h3>PortPkg <%= @port_pkg.id %> for
+<%= link_to @port_pkg.port.name, :controller => 'port', :action => 'show', :id => @port_pkg.port %>
+</h3>
+
<p>
- <b><%= column.human_name %>:</b> <%=h @port_pkg.send(column.name) %>
+ <strong>epoch:</strong> <%= @port_pkg.epoch %>
+ <strong>version:</strong> <%= @port_pkg.version %>
+ <strong>revision:</strong> <%= @port_pkg.revision %>
</p>
-<% end %>
-<h4>Port</h4>
-<p><%= link_to @port_pkg.port.name, :controller => 'port', :action => 'show', :id => @port_pkg.port %></p>
+<p>
+ <strong>Submitted at</strong> <%= @port_pkg.submitted_at %>
+ <strong>by</strong> <%= link_to @port_pkg.submitter.user_name,
+ :controller => 'person', :action => 'show',
+ :id => @port_pkg.submitter %>
+</p>
-<h4>Submitter</h4>
-<p><%= link_to @port_pkg.submitter.user_name, :controller => 'person', :action => 'show', :id => @port_pkg.submitter %></p>
+<p>
+ <strong>Submitter notes:</strong>
+ <%= simple_format(word_wrap(@port_pkg.submitter_notes)) if @port_pkg.submitter_notes %>
+</p>
-<h4>Variants</h4>
<p>
- <% for variant in @port_pkg.variants %>
+ <strong>Variants:</strong>
+ <% for variant in @port_pkg.variants.sort %>
<%= link_to variant.name, :controller => 'variant', :action => 'show', :id => variant %>
<% end %>
</p>
+<p>
+ <strong>Tags</strong>
+ <% for tag in @port_pkg.tags.sort %>
+ <%= link_to tag.name, :controller => 'tag', :action => 'show', :id => tag %>
+ <% end %>
+</p>
+
<h4>Files</h4>
<table>
<% for file in @port_pkg.files %>
@@ -27,12 +44,3 @@
<% end %>
</table>
-<h4>Tags</h4>
-<p>
- <% for tag in @port_pkg.tags %>
- <%= link_to tag.name, :controller => 'tag', :action => 'show', :id => tag %>
- <% end %>
-</p>
-
-<%= link_to 'Edit', :action => 'edit', :id => @port_pkg %> |
-<%= link_to 'Back', :action => 'list' %>
Modified: users/jberry/mpwa/app/views/port_pkg_file/show.rhtml
===================================================================
--- users/jberry/mpwa/app/views/port_pkg_file/show.rhtml 2007-05-11 03:59:55 UTC (rev 24999)
+++ users/jberry/mpwa/app/views/port_pkg_file/show.rhtml 2007-05-11 04:11:06 UTC (rev 25000)
@@ -1,17 +1,23 @@
-<% for column in PortPkgFile.content_columns %>
+<h2>File
+<%= link_to @port_pkg_file.file_path, :controller => 'port_pkg_file',
+ :action => 'emit', :id => @port_pkg_file %>
+</h2>
+
<p>
- <b><%= column.human_name %>:</b> <%=h @port_pkg_file.send(column.name) %>
+ <strong>Port:</strong>
+ <%= link_to @port_pkg_file.port_pkg.port.name, :controller => 'port', :action => 'show',
+ :id => @port_pkg_file.port_pkg.port %>
</p>
-<% end %>
<p>
- <b>Port</b>
- <%= link_to @port_pkg_file.port_pkg.port.name, :controller => 'port', :action => 'show',
- :id => @port_pkg_file.port_pkg.port %><br />
- <b>PortPkg</b>
- <%= link_to @port_pkg_file.port_pkg.id, :controller => 'port_pkg', :action => 'show',
- :id => @port_pkg_file.port_pkg %>
+ <strong>Port_pkg:</strong>
+ <%= link_to @port_pkg_file.port_pkg.id, :controller => 'port_pkg', :action => 'show',
+ :id => @port_pkg_file.port_pkg %>
</p>
-<%= link_to 'Edit', :action => 'edit', :id => @port_pkg_file %> |
-<%= link_to 'Back', :action => 'list' %>
+<% for column in PortPkgFile.content_columns %>
+<p>
+ <strong><%= column.human_name %>:</strong> <%=h @port_pkg_file.send(column.name) %>
+</p>
+<% end %>
+
Modified: users/jberry/mpwa/app/views/tag/show.rhtml
===================================================================
--- users/jberry/mpwa/app/views/tag/show.rhtml 2007-05-11 03:59:55 UTC (rev 24999)
+++ users/jberry/mpwa/app/views/tag/show.rhtml 2007-05-11 04:11:06 UTC (rev 25000)
@@ -6,7 +6,7 @@
<% for row in columnize(@tag.ports.sort, 4) %>
<tr>
<% for port in row %>
- <td><%= link_to port.name, :controller => 'port', :action => 'show', :id => port if !port.nil? %></td>
+ <td><%= link_to port.name, :controller => 'port', :action => 'show', :id => port if port %></td>
<% end %>
</tr>
<% end %>
@@ -14,10 +14,10 @@
<h4>Port Packages with this tag</h4>
<table>
- <% for row in columnize(@tag.port_pkgs, 6) %>
+ <% for row in columnize(@tag.port_pkgs, 16) %>
<tr>
<% for pkg in row %>
- <td><%= link_to pkg.id, :controller => 'port_pkg', :action => 'show', :id => pkg if !pkg.nil? %></td>
+ <td><%= link_to pkg.id, :controller => 'port_pkg', :action => 'show', :id => pkg if pkg %></td>
<% end %>
</tr>
<% end %>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070510/453b0554/attachment.html
More information about the macports-changes
mailing list