Fix usage of media classes

griffon-legacy · Jul 18, 2013 · 87835d9 · 87835d9
1 parent 8eb34d2
commit 87835d9
Show file tree

Hide file tree

Showing 7 changed files with 78 additions and 84 deletions.
diff --git a/grails-app/views/artifact/common/_artifact_header_properties.gsp b/grails-app/views/artifact/common/_artifact_header_properties.gsp
@@ -67,12 +67,13 @@
     <div class="artifact-show" aria-labelledby="rating-label">
         <g:if test="${session.user}">
             <div class="artifact-ratings ratings">
-                <rateable:ratings bean='${artifactInstance}'/>
+                <rateable:ratings bean='${artifactInstance}'/><br clear="all"/><br clear="all"/>
             </div>
         </g:if>
         <g:else>
             <g:render template="/shared/rating_offline"
                       model="[artifactInstance: artifactInstance, login: true]"/>
+            <br clear="all"/><br clear="all"/>
         </g:else>
     </div>
 </div>

diff --git a/grails-app/views/artifact/common/_authored_by.gsp b/grails-app/views/artifact/common/_authored_by.gsp
@@ -1,33 +1,33 @@
 <!-- BEGIN: AUTHORED_BY -->
 <h3>Authored by:</h3>
-<g:each in="${authorList}" var="author">
-    <table>
-        <tr>
-            <td class="thumbnail">
-                <g:if test="${author.username}">
-                    <g:link controller="profile" action="show"
-                            id="${author.username}"
-                            mapping="profile">
-                        <ui:avatar user="${author.email}" size="50"
-                                   class="img-rounded"/>
-                    </g:link>
-                </g:if>
-                <g:else>
-                    <g:link controller="author" action="show"
-                            id="${author.id}" mapping="author">
-                        <ui:avatar user="${author.email}" size="50"
-                                   class="img-rounded"/>
-                    </g:link>
-                </g:else>
-            </td>
-            <td>&nbsp;</td>
-            <td>
-                <address>
-                    <strong>${author.name}</strong><br/>
-                    <a mailto="">${author.email}</a>
-                </address>
-            </td>
-        </tr>
-    </table>
-</g:each>
+<ul class="media-list">
+    <g:each in="${authorList}" var="author">
+        <li class="media">
+            <g:if test="${author.username}">
+                <g:link controller="profile" action="show"
+                        id="${author.username}" class="pull-left"
+                        mapping="profile">
+                    <ui:avatar user="${author.email}" size="50"
+                               class="media-object img-rounded"/>
+                </g:link>
+            </g:if>
+            <g:else>
+                <g:link controller="author" action="show" class="pull-left"
+                        id="${author.id}" mapping="author">
+                    <ui:avatar user="${author.email}" size="50"
+                               class="media-object img-rounded"/>
+                </g:link>
+            </g:else>
+
+            <div class="media-body">
+                <div class="media-heading">
+                    <address>
+                        <strong>${author.name}</strong><br/>
+                        <a mailto="">${author.email}</a>
+                    </address>
+                </div>
+            </div>
+        </li>
+    </g:each>
+</ul>
 <!-- END: AUTHORED_BY -->
diff --git a/grails-app/views/artifact/common/_tags.gsp b/grails-app/views/artifact/common/_tags.gsp
@@ -4,9 +4,7 @@
         <g:if test="${!session.user}">
             <g:link controller="user" action="login" mapping="signin"
                     params="[originalURI: (request.forwardURI - application.contextPath)]"
-                    title="Add or remove tags"><g:img
-                dir="images"
-                file="tag.png" style="vertical-align: middle"/></g:link>
+                    title="Add or remove tags" class="btn btn-info"><i class="icon-tags icon-white"></i></g:link>
         </g:if>
         <g:else>
             <div id="modal-tags" class="modal hide fade">

diff --git a/grails-app/views/artifact/tabs/_installation.gsp b/grails-app/views/artifact/tabs/_installation.gsp
@@ -6,6 +6,7 @@
 <p>There are several ways to install a release of ${artifactInstance.name} using the <code>install-${artifactInstance.type}</code> target of the griffon command line tool.
 </p>
 
+
 <div class="row">
     <div class="span5">
         <h2>Name and Version</h2>
@@ -68,4 +69,4 @@
             </div>
         </div>
     </g:if>
-</g:if>
+</g:if>
diff --git a/grails-app/views/author/_header.gsp b/grails-app/views/author/_header.gsp
@@ -1,21 +1,17 @@
 <tmpl:/shared/pageheader>
-    <table>
-        <tr>
-            <td class="thumbnail">
-                <a href="#">
-                    <ui:avatar user="${authorInstance.email}" size="100"
-                               class="img-rounded"/>
-                </a>
-            </td>
-            <td>&nbsp;</td>
-            <td>
-                <address>
-                    <h2><g:fieldValue bean="${authorInstance}"
-                                      field="name"/></h2>
-                    <g:fieldValue bean="${authorInstance}"
-                                  field="email"/><br/>
-                </address>
-            </td>
-        </tr>
-    </table>
+    <div class="media">
+        <a href="#" class="pull-left">
+            <ui:avatar user="${authorInstance.email}"
+                       size="90"
+                       class="media-object img-rounded"/>
+        </a>
+
+        <div class="media-body">
+            <address>
+                <h3><g:fieldValue bean="${authorInstance}"
+                                  field="name"/></h3>
+                <a mailto="">${authorInstance.email}</a>
+            </address>
+        </div>
+    </div>
 </tmpl:/shared/pageheader>
diff --git a/grails-app/views/profile/profile/_header.gsp b/grails-app/views/profile/profile/_header.gsp
@@ -1,35 +1,33 @@
 <%@ page import="grails.util.GrailsNameUtils; griffon.portal.auth.Membership" %>
 
 <tmpl:/shared/pageheader>
-    <table>
-        <tr>
-            <td class="thumbnail">
-                <a href="#">
-                    <ui:avatar user="${profileInstance.gravatarEmail}"
-                               size="100"
-                               class="img-rounded"/>
-                </a>
-            </td>
-            <td>&nbsp;</td>
-            <td>
-                <address>
-                    <h2><g:fieldValue bean="${profileInstance.user}"
-                                      field="username"/></h2>
-                    <g:fieldValue bean="${profileInstance.user}"
-                                  field="fullName"/>
-                    <small>(<g:message code="user.membership.label"
-                                       default="Member since"/></small>
-                    <g:formatDate date="${profileInstance.user.dateCreated}"
-                                  format="MMM dd, yyyy"/><small>)</small>
-                    <br/>
-                    <g:if test="${profileInstance.website}">
-                        <a href="${profileInstance.website}"><g:fieldValue
-                            bean="${profileInstance}" field="website"/></a>
-                    </g:if>
-                </address>
-            </td>
-        </tr>
-    </table>
+    <div class="media">
+        <a href="#" class="pull-left">
+            <ui:avatar user="${profileInstance.gravatarEmail}"
+                       size="90"
+                       class="media-object img-rounded"/>
+        </a>
+
+        <div class="media-body">
+            <h3 class="media-heading"><g:fieldValue
+                bean="${profileInstance.user}"
+                field="username"/></h3>
+
+            <address>
+                <g:fieldValue bean="${profileInstance.user}"
+                              field="fullName"/>
+                <small>(<g:message code="user.membership.label"
+                                   default="Member since"/></small>
+                <g:formatDate date="${profileInstance.user.dateCreated}"
+                              format="MMM dd, yyyy"/><small>)</small>
+                <br/>
+                <g:if test="${profileInstance.website}">
+                    <a href="${profileInstance.website}"><g:fieldValue
+                        bean="${profileInstance}" field="website"/></a>
+                </g:if>
+            </address>
+        </div>
+    </div>
 </tmpl:/shared/pageheader>
 
 <g:if test="${!GrailsNameUtils.isBlank(profileInstance.bio)}">

diff --git a/src/java/griffon/portal/values/ArtifactTab.java b/src/java/griffon/portal/values/ArtifactTab.java
@@ -25,8 +25,8 @@
  * @author Andres Almiray
  */
 public enum ArtifactTab {
-    DESCRIPTION,
     INSTALLATION,
+    DESCRIPTION,
     RELEASES,
     // FAQ,
     // SCREENSHOTS,