Merge branch 'master' of github.com:neocities/neocities

views/browse.erb

@@ -82,8 +82,6 @@
            title="<%= site.title %>"
            <% if @surfmode %>
              onclick="surf(<%= ((@page-1)*Site::BROWSE_PAGINATION_LENGTH)+i+1 %>); return false"
-           <% else %>
-             href="<%= site.uri %>"
            <% end %>
         >
           <span class="img-Holder" style="background:url(<%= site.screenshot_url('index.html', '540x405') %>) no-repeat;">
@@ -91,7 +89,12 @@
           </span>
         </a>
         <div class="title">
-          <a href="<%= site.uri %>" title="<%= site.title %>" onclick="surf(<%= i+1 %>); return false"><%= site.title.shorten(30) %></a>
+          <a href="<%= site.uri %>"
+             title="<%= site.title %>"
+             <% if @surfmode %>
+               onclick="surf(<%= ((@page-1)*Site::BROWSE_PAGINATION_LENGTH)+i+1 %>); return false"
+             <% end %>
+          ><%= site.title.shorten(30) %></a>
         </div>
         <div class="site-info">
           <div class="username">

views/mockup/welcome.erb

@@ -48,7 +48,7 @@ You can support our quest to bring back the creative, independent web by upgradi
             <li><span data-original-title="Make as many sites as you want with one account, and easily switch between them.">Unlimited Site Creation</span></li>
             <li><span data-original-title="Add your domain name (yoursite.com) to your site!">Custom Domain Support</span></li>
             <li><span data-original-title="With WebDAV, you can mount your Neocities site to your computer as a hard drive, making it easy to update with your favorite HTML editor.">Remote Filesystem Support</span></li>
-            <li><span data-original-title="Upload your SSL certificate for your custom domain name, preventing snoops from seeing your user’s traffic.">Custom SSL Certs (coming soon)</span></li>
+            <li><span data-original-title="Upload your SSL certificate for your custom domain name, preventing snoops from seeing your users’ traffic.">Custom SSL Certs (coming soon)</span></li>
           </ul>
         </div>
       
@@ -98,4 +98,4 @@ You can support our quest to bring back the creative, independent web by upgradi
       <p>Maybe something about open source...</p>
     </div>
   </div>
-</section>
+</section>

views/supporter/_compare.erb

@@ -116,7 +116,7 @@
   </tr>
   <tr>
     <td class="feature-column">
-      <span data-original-title="Instant SSL certs, preventing snoops from seeing your user's traffic.">Custom Domain SSL Certs</span>
+      <span data-original-title="Instant SSL certs, preventing snoops from seeing your users' traffic.">Custom Domain SSL Certs</span>
     </td>
     <td></td>
     <td><i class="fa fa-check"></i></td>