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

This commit is contained in:
Sam Saffron 2013-02-13 20:38:59 +11:00
commit b7c5687b10
8 changed files with 65 additions and 75 deletions

View File

@ -126,7 +126,7 @@
width: 140px;
}
.posters {
width: 141px;
width: 142px;
> a {
float: left;
margin-right: 4px;

View File

@ -3,7 +3,10 @@ class TosController < ApplicationController
skip_before_filter :check_xhr
def index
render layout: false
@company_shortname = 'CDCK'
@company_fullname = 'Civilized Discourse Construction Kit, Inc.'
@company_domain = 'discourse.org'
render
end
end

View File

@ -126,7 +126,7 @@ class SiteSetting < ActiveRecord::Base
# Trust related
setting(:basic_requires_topics_entered, 5)
setting(:basic_requires_read_posts, 100)
setting(:basic_requires_read_posts, 50)
setting(:basic_requires_time_spent_mins, 30)
# Entropy checks

View File

@ -1,27 +1,31 @@
<% local_domain = "#{request.protocol}#{request.host_with_port}" %>
<p>The page you requested doesn't exist on this discussion forum. Perhaps we can help find it, or another topic like it:</p>
<table>
<tr>
<td style='padding: 5px 10px 20px 0'>
<h2>Most popular topics</h2>
<td style="vertical-align:top; padding:0 20px 20px 0;">
<h2>Popular topics</h2>
<% @popular.each do |t| %>
<a href='<%= t.relative_url %>'><%= t.title %></a><br/>
<% end %>
<a href="/popular">See More...</a>
<br/>
<a href="/popular" class="btn">See More&hellip;</a>
</td>
<td style='padding: 5px 0 20px'>
<td style="vertical-align:top; padding:0 0 20px 0;">
<h2>Recent topics</h2>
<% @recent.each do |t| %>
<a href='<%= t.relative_url %>'><%= t.title %></a><br/>
<% end %>
<a href="/popular">See More...</a>
<br/>
<a href="/popular" class="btn">See More&hellip;</a>
</td>
</tr>
</table>
<h2>Search for this topic</h2>
<p>
<form action='http://google.com'>
<input type="text" name='q' value="<%= @slug %>">
<input type="button" value="Search Here" onclick="alert('single page search results not implemented yet');" />
<input type="submit" value="Search Google" />
<input type="text" name='q' value="site:<%= local_domain %> <%= @slug %>">
<!--<input type="button" class="btn" value="Search Here" onclick="alert('single page search results not implemented yet');" />-->
<input type="submit" class="btn btn-primary" value="Search Google" />
</form>
</p>

View File

@ -1,10 +1,11 @@
<table class="topic-list">
<div class="topic-list">
<% @list.topics.each do |t| %>
<tr>
<td><a href="<%= t.relative_url %>"><%= t.title %></a> <span title='total posts'>[<%= t.posts_count %>]</span></td>
</tr>
<a href="<%= t.relative_url %>"><%= t.title %></a> <span title='posts'>(<%= t.posts_count %>)</span><br/>
<% end %>
</table>
</div>
<% if @list.topics.length > 0 %>
<a href="<%= @list.more_topics_url.sub('.json?','?') %>">next page</a>
<p><a href="<%= @list.more_topics_url.sub('.json?','?') %>">next page &rarr;</a></p>
<% end %>
<p>Powered by <a href="http://www.discourse.org">Discourse</a>, best viewed with JavaScript enabled</p>

View File

@ -1,14 +1,14 @@
<p>
The following terms and conditions govern all use of the Discourse.org website and all content, services and products available at or through the website, including, but not limited to, Discourse Forum Software, Support Forums and the Discourse.org Hosting service (“Hosting”), (taken together, the Website). The Website is owned and operated by Civilized Discourse Construction Kit, Inc. (“CDCK”). The Website is offered subject to your acceptance without modification of all of the terms and conditions contained herein and all other operating rules, policies (including, without limitation, Discourse.orgs <a href="/privacy">Privacy Policy</a> and <a href="/faq">Community Guidelines</a>) and procedures that may be published from time to time on this Site by CDCK (collectively, the “Agreement”).
The following terms and conditions govern all use of the <%= @company_domain %> website and all content, services and products available at or through the website, including, but not limited to, <%= @company_domain %> Forum Software, <%= @company_domain %> Support Forums and the <%= @company_domain %> Hosting service (“Hosting”), (taken together, the Website). The Website is owned and operated by <%= @company_fullname %> (“<%= @company_shortname %>”). The Website is offered subject to your acceptance without modification of all of the terms and conditions contained herein and all other operating rules, policies (including, without limitation, <%= @company_domain %>s <a href="/privacy">Privacy Policy</a> and <a href="/faq">Community Guidelines</a>) and procedures that may be published from time to time on this Site by <%= @company_shortname %> (collectively, the “Agreement”).
</p>
<p>
Please read this Agreement carefully before accessing or using the Website. By accessing or using any part of the web site, you agree to become bound by the terms and conditions of this agreement. If you do not agree to all the terms and conditions of this agreement, then you may not access the Website or use any services. If these terms and conditions are considered an offer by CDCK, acceptance is expressly limited to these terms. The Website is available only to individuals who are at least 13 years old.
Please read this Agreement carefully before accessing or using the Website. By accessing or using any part of the web site, you agree to become bound by the terms and conditions of this agreement. If you do not agree to all the terms and conditions of this agreement, then you may not access the Website or use any services. If these terms and conditions are considered an offer by <%= @company_shortname %>, acceptance is expressly limited to these terms. The Website is available only to individuals who are at least 13 years old.
</p>
<h2>1. Your Discourse.org Account</h2>
<h2>1. Your <%= @company_domain %> Account</h2>
<p>
If you create an account on the Website, you are responsible for maintaining the security of your account and you are fully responsible for all activities that occur under the account. You must immediately notify CDCK of any unauthorized uses of your account or any other breaches of security. CDCK will not be liable for any acts or omissions by you, including any damages of any kind incurred as a result of such acts or omissions.
If you create an account on the Website, you are responsible for maintaining the security of your account and you are fully responsible for all activities that occur under the account. You must immediately notify <%= @company_shortname %> of any unauthorized uses of your account or any other breaches of security. <%= @company_shortname %> will not be liable for any acts or omissions by you, including any damages of any kind incurred as a result of such acts or omissions.
</p>
<h2>2. Responsibility of Contributors</h2>
@ -32,92 +32,92 @@
<li>your content is not named in a manner that misleads your readers into thinking that you are another person or company; and</li>
<li>you have, in the case of Content that includes computer code, accurately categorized and/or described the type, nature, uses and effects of the materials, whether requested to do so by CDCK or otherwise.</li>
<li>you have, in the case of Content that includes computer code, accurately categorized and/or described the type, nature, uses and effects of the materials, whether requested to do so by <%= @company_shortname %> or otherwise.</li>
</ul>
<h2>3. User Content License</h2>
<!--<p>
By submitting Content to CDCK for inclusion on your Website, you grant CDCK a world-wide, royalty-free, and non-exclusive license to reproduce, modify, adapt and publish the Content solely for the purpose of displaying, distributing and promoting your content. If you delete Content, CDCK will use reasonable efforts to remove it from the Website, but you acknowledge that caching or references to the Content may not be made immediately unavailable.
By submitting Content to <%= @company_shortname %> for inclusion on your Website, you grant <%= @company_shortname %> a world-wide, royalty-free, and non-exclusive license to reproduce, modify, adapt and publish the Content solely for the purpose of displaying, distributing and promoting your content. If you delete Content, <%= @company_shortname %> will use reasonable efforts to remove it from the Website, but you acknowledge that caching or references to the Content may not be made immediately unavailable.
</p>-->
<p>
User contributions are licensed under a <a href="http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_US">Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License</a>. Without limiting any of those representations or warranties, CDCK has the right (though not the obligation) to, in CDCKs sole discretion (i) refuse or remove any content that, in CDCKs reasonable opinion, violates any CDCK policy or is in any way harmful or objectionable, or (ii) terminate or deny access to and use of the Website to any individual or entity for any reason, in CDCKs sole discretion. CDCK will have no obligation to provide a refund of any amounts previously paid.
User contributions are licensed under a <a href="http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_US">Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License</a>. Without limiting any of those representations or warranties, <%= @company_shortname %> has the right (though not the obligation) to, in <%= @company_shortname %>s sole discretion (i) refuse or remove any content that, in <%= @company_shortname %>s reasonable opinion, violates any <%= @company_shortname %> policy or is in any way harmful or objectionable, or (ii) terminate or deny access to and use of the Website to any individual or entity for any reason, in <%= @company_shortname %>s sole discretion. <%= @company_shortname %> will have no obligation to provide a refund of any amounts previously paid.
</p>
<p>
Without limiting any of those representations or warranties, CDCK has the right (though not the obligation) to, in CDCKs sole discretion (i) refuse or remove any content that, in CDCKs reasonable opinion, violates any CDCK policy or is in any way harmful or objectionable, or (ii) terminate or deny access to and use of the Website to any individual or entity for any reason, in CDCKs sole discretion. CDCK will have no obligation to provide a refund of any amounts previously paid.
Without limiting any of those representations or warranties, <%= @company_shortname %> has the right (though not the obligation) to, in <%= @company_shortname %>s sole discretion (i) refuse or remove any content that, in <%= @company_shortname %>s reasonable opinion, violates any <%= @company_shortname %> policy or is in any way harmful or objectionable, or (ii) terminate or deny access to and use of the Website to any individual or entity for any reason, in <%= @company_shortname %>s sole discretion. <%= @company_shortname %> will have no obligation to provide a refund of any amounts previously paid.
</p>
<h2>4. Payment and Renewal</h2>
<h3>General Terms</h3>
<p>
Optional paid services such as extra storage, or domain purchases are available on the Website (any such services, an “Upgrade”). By selecting an Upgrade you agree to pay CDCK the monthly or annual subscription fees indicated for that service. Payments will be charged on a pre-pay basis on the day you sign up for an Upgrade and will cover the use of that service for a monthly or annual subscription period as indicated. Upgrade fees are not refundable.
Optional paid services such as extra storage, or domain purchases are available on the Website (any such services, an “Upgrade”). By selecting an Upgrade you agree to pay <%= @company_shortname %> the monthly or annual subscription fees indicated for that service. Payments will be charged on a pre-pay basis on the day you sign up for an Upgrade and will cover the use of that service for a monthly or annual subscription period as indicated. Upgrade fees are not refundable.
</p>
<h3>Automatic Renewal</h3>
<p>Unless you notify CDCK before the end of the applicable subscription period that you want to cancel an Upgrade, your Upgrade subscription will automatically renew and you authorize us to collect the then-applicable annual or monthly subscription fee for such Upgrade (as well as any taxes) using any credit card or other payment mechanism we have on record for you. Upgrades can be canceled at any time in the Upgrades section of your sites dashboard.
<p>Unless you notify <%= @company_shortname %> before the end of the applicable subscription period that you want to cancel an Upgrade, your Upgrade subscription will automatically renew and you authorize us to collect the then-applicable annual or monthly subscription fee for such Upgrade (as well as any taxes) using any credit card or other payment mechanism we have on record for you. Upgrades can be canceled at any time in the Upgrades section of your sites dashboard.
</p>
<h2>5. Services</h2>
<h3>Hosting, Support Services</h3>
<p>Hosting and Support services are provided by CDCK under the terms and conditions for each such service, which are located at /hosting-tos and /support-tos, respectively. By signing up for a Hosting/Support or Support services account, you agree to abide by such terms and conditions.
<p>Hosting and Support services are provided by <%= @company_shortname %> under the terms and conditions for each such service, which are located at /hosting-tos and /support-tos, respectively. By signing up for a Hosting/Support or Support services account, you agree to abide by such terms and conditions.
</p>
<h2>6. Responsibility of Website Visitors</h2>
<p>
CDCK has not reviewed, and cannot review, all of the material, including computer software, posted to the Website, and cannot therefore be responsible for that materials content, use or effects. By operating the Website, CDCK does not represent or imply that it endorses the material there posted, or that it believes such material to be accurate, useful or non-harmful. You are responsible for taking precautions as necessary to protect yourself and your computer systems from viruses, worms, Trojan horses, and other harmful or destructive content. The Website may contain content that is offensive, indecent, or otherwise objectionable, as well as content containing technical inaccuracies, typographical mistakes, and other errors. The Website may also contain material that violates the privacy or publicity rights, or infringes the intellectual property and other proprietary rights, of third parties, or the downloading, copying or use of which is subject to additional terms and conditions, stated or unstated. CDCK disclaims any responsibility for any harm resulting from the use by visitors of the Website, or from any downloading by those visitors of content there posted.
<%= @company_shortname %> has not reviewed, and cannot review, all of the material, including computer software, posted to the Website, and cannot therefore be responsible for that materials content, use or effects. By operating the Website, <%= @company_shortname %> does not represent or imply that it endorses the material there posted, or that it believes such material to be accurate, useful or non-harmful. You are responsible for taking precautions as necessary to protect yourself and your computer systems from viruses, worms, Trojan horses, and other harmful or destructive content. The Website may contain content that is offensive, indecent, or otherwise objectionable, as well as content containing technical inaccuracies, typographical mistakes, and other errors. The Website may also contain material that violates the privacy or publicity rights, or infringes the intellectual property and other proprietary rights, of third parties, or the downloading, copying or use of which is subject to additional terms and conditions, stated or unstated. <%= @company_shortname %> disclaims any responsibility for any harm resulting from the use by visitors of the Website, or from any downloading by those visitors of content there posted.
</p>
<h2>7. Content Posted on Other Websites</h2>
<p>We have not reviewed, and cannot review, all of the material, including computer software, made available through the websites and webpages to which Discourse.org links, and that link to Discourse.org. CDCK does not have any control over those non-Discourse.org websites and webpages, and is not responsible for their contents or their use. By linking to a non-Discourse.org website or webpage, CDCK does not represent or imply that it endorses such website or webpage. You are responsible for taking precautions as necessary to protect yourself and your computer systems from viruses, worms, Trojan horses, and other harmful or destructive content. CDCK disclaims any responsibility for any harm resulting from your use of non-WordPress websites and webpages.
<p>We have not reviewed, and cannot review, all of the material, including computer software, made available through the websites and webpages to which <%= @company_domain %> links, and that link to <%= @company_domain %>. <%= @company_shortname %> does not have any control over those non-<%= @company_domain %> websites and webpages, and is not responsible for their contents or their use. By linking to a non-<%= @company_domain %> website or webpage, <%= @company_shortname %> does not represent or imply that it endorses such website or webpage. You are responsible for taking precautions as necessary to protect yourself and your computer systems from viruses, worms, Trojan horses, and other harmful or destructive content. <%= @company_shortname %> disclaims any responsibility for any harm resulting from your use of non-WordPress websites and webpages.
</p>
<h2>8. Copyright Infringement and DMCA Policy</h2>
<p>
As CDCK asks others to respect its intellectual property rights, it respects the intellectual property rights of others. If you believe that material located on or linked to by Discourse.org violates your copyright, you are encouraged to notify CDCK in accordance with CDCKs Digital Millennium Copyright Act (“DMCA”) Policy. CDCK will respond to all such notices, including as required or appropriate by removing the infringing material or disabling all links to the infringing material. CDCK will terminate a visitors access to and use of the Website if, under appropriate circumstances, the visitor is determined to be a repeat infringer of the copyrights or other intellectual property rights of CDCK or others. In the case of such termination, CDCK will have no obligation to provide a refund of any amounts previously paid to CDCK.
As <%= @company_shortname %> asks others to respect its intellectual property rights, it respects the intellectual property rights of others. If you believe that material located on or linked to by <%= @company_domain %> violates your copyright, you are encouraged to notify <%= @company_shortname %> in accordance with <%= @company_shortname %>s <a href="http://en.wikipedia.org/wiki/Digital_Millennium_Copyright_Act">Digital Millennium Copyright Act</a> (“DMCA”) Policy. <%= @company_shortname %> will respond to all such notices, including as required or appropriate by removing the infringing material or disabling all links to the infringing material. <%= @company_shortname %> will terminate a visitors access to and use of the Website if, under appropriate circumstances, the visitor is determined to be a repeat infringer of the copyrights or other intellectual property rights of <%= @company_shortname %> or others. In the case of such termination, <%= @company_shortname %> will have no obligation to provide a refund of any amounts previously paid to <%= @company_shortname %>.
</p>
<h2>9. Intellectual Property</h2>
<p>
This Agreement does not transfer from CDCK to you any CDCK or third party intellectual property, and all right, title and interest in and to such property will remain (as between the parties) solely with CDCK. CDCK, Discourse.org, the Discourse.org logo, and all other trademarks, service marks, graphics and logos used in connection with Discourse.org, or the Website are trademarks or registered trademarks of CDCK or CDCKs licensors. Other trademarks, service marks, graphics and logos used in connection with the Website may be the trademarks of other third parties. Your use of the Website grants you no right or license to reproduce or otherwise use any CDCK or third-party trademarks.
This Agreement does not transfer from <%= @company_shortname %> to you any <%= @company_shortname %> or third party intellectual property, and all right, title and interest in and to such property will remain (as between the parties) solely with <%= @company_shortname %>. <%= @company_shortname %>, <%= @company_domain %>, the <%= @company_domain %> logo, and all other trademarks, service marks, graphics and logos used in connection with <%= @company_domain %>, or the Website are trademarks or registered trademarks of <%= @company_shortname %> or <%= @company_shortname %>s licensors. Other trademarks, service marks, graphics and logos used in connection with the Website may be the trademarks of other third parties. Your use of the Website grants you no right or license to reproduce or otherwise use any <%= @company_shortname %> or third-party trademarks.
</p>
<h2>10. Advertisements</h2>
<p>CDCK reserves the right to display advertisements on your content unless you have purchased an Ad-free Upgrade or a Services account.</p>
<p><%= @company_shortname %> reserves the right to display advertisements on your content unless you have purchased an Ad-free Upgrade or a Services account.</p>
<h2>11. Attribution</h2>
<p>CDCK reserves the right to display attribution links such as Powered by Discourse.org, theme author, and font attribution in your content footer or toolbar. Footer credits and the Discourse.org toolbar may not be removed regardless of upgrades purchased.</p>
<p><%= @company_shortname %> reserves the right to display attribution links such as Powered by <%= @company_domain %>, theme author, and font attribution in your content footer or toolbar. Footer credits and the <%= @company_domain %> toolbar may not be removed regardless of upgrades purchased.</p>
<h2>12. Changes</h3>
<p>
CDCK reserves the right, at its sole discretion, to modify or replace any part of this Agreement. It is your responsibility to check this Agreement periodically for changes. Your continued use of or access to the Website following the posting of any changes to this Agreement constitutes acceptance of those changes. CDCK may also, in the future, offer new services and/or features through the Website (including, the release of new tools and resources). Such new features and/or services shall be subject to the terms and conditions of this Agreement.
<%= @company_shortname %> reserves the right, at its sole discretion, to modify or replace any part of this Agreement. It is your responsibility to check this Agreement periodically for changes. Your continued use of or access to the Website following the posting of any changes to this Agreement constitutes acceptance of those changes. <%= @company_shortname %> may also, in the future, offer new services and/or features through the Website (including, the release of new tools and resources). Such new features and/or services shall be subject to the terms and conditions of this Agreement.
</p>
<h2>13. Termination</h2>
<p>
CDCK may terminate your access to all or any part of the Website at any time, with or without cause, with or without notice, effective immediately. If you wish to terminate this Agreement or your Discourse.org account (if you have one), you may simply discontinue using the Website. All provisions of this Agreement which by their nature should survive termination shall survive termination, including, without limitation, ownership provisions, warranty disclaimers, indemnity and limitations of liability.
<%= @company_shortname %> may terminate your access to all or any part of the Website at any time, with or without cause, with or without notice, effective immediately. If you wish to terminate this Agreement or your <%= @company_domain %> account (if you have one), you may simply discontinue using the Website. All provisions of this Agreement which by their nature should survive termination shall survive termination, including, without limitation, ownership provisions, warranty disclaimers, indemnity and limitations of liability.
</p>
<h2>14.Disclaimer of Warranties.</h2>
<p>
The Website is provided “as is”. CDCK and its suppliers and licensors hereby disclaim all warranties of any kind, express or implied, including, without limitation, the warranties of merchantability, fitness for a particular purpose and non-infringement. Neither CDCK nor its suppliers and licensors, makes any warranty that the Website will be error free or that cess thereto will be continuous or uninterrupted. If youre actually reading this, heres <a href="http://www.newyorker.com/online/blogs/shouts/2012/12/the-hundred-best-lists-of-all-time.html">a treat</a>. You understand that you download from, or otherwise obtain content or services through, the Website at your own discretion and risk.
The Website is provided “as is”. <%= @company_shortname %> and its suppliers and licensors hereby disclaim all warranties of any kind, express or implied, including, without limitation, the warranties of merchantability, fitness for a particular purpose and non-infringement. Neither <%= @company_shortname %> nor its suppliers and licensors, makes any warranty that the Website will be error free or that cess thereto will be continuous or uninterrupted. If youre actually reading this, heres <a href="http://www.newyorker.com/online/blogs/shouts/2012/12/the-hundred-best-lists-of-all-time.html">a treat</a>. You understand that you download from, or otherwise obtain content or services through, the Website at your own discretion and risk.
</p>
<h2>15. Limitation of Liability.</h2>
<p>
In no event will CDCK, or its suppliers or licensors, be liable with respect to any subject matter of this agreement under any contract, negligence, strict liability or other legal or equitable theory for: (i) any special, incidental or consequential damages; (ii) the cost of procurement for substitute products or services; (iii) for interruption of use or loss or corruption of data; or (iv) for any amounts that exceed the fees paid by you to CDCK under this agreement during the twelve (12) month period prior to the cause of action. CDCK shall have no liability for any failure or delay due to matters beyond their reasonable control. The foregoing shall not apply to the extent prohibited by applicable law.
In no event will <%= @company_shortname %>, or its suppliers or licensors, be liable with respect to any subject matter of this agreement under any contract, negligence, strict liability or other legal or equitable theory for: (i) any special, incidental or consequential damages; (ii) the cost of procurement for substitute products or services; (iii) for interruption of use or loss or corruption of data; or (iv) for any amounts that exceed the fees paid by you to <%= @company_shortname %> under this agreement during the twelve (12) month period prior to the cause of action. <%= @company_shortname %> shall have no liability for any failure or delay due to matters beyond their reasonable control. The foregoing shall not apply to the extent prohibited by applicable law.
</p>
<h2>16. General Representation and Warranty.</h2>
<p>
You represent and warrant that (i) your use of the Website will be in strict accordance with the CDCK <a href="/privacy">Privacy Policy<a>, <a href="/faq">Community Guidelines</a>, with this Agreement and with all applicable laws and regulations (including without limitation any local laws or regulations in your country, state, city, or other governmental area, regarding online conduct and acceptable content, and including all applicable laws regarding the transmission of technical data exported from the United States or the country in which you reside) and (ii) your use of the Website will not infringe or misappropriate the intellectual property rights of any third party.
You represent and warrant that (i) your use of the Website will be in strict accordance with the <%= @company_shortname %> <a href="/privacy">Privacy Policy<a>, <a href="/faq">Community Guidelines</a>, with this Agreement and with all applicable laws and regulations (including without limitation any local laws or regulations in your country, state, city, or other governmental area, regarding online conduct and acceptable content, and including all applicable laws regarding the transmission of technical data exported from the United States or the country in which you reside) and (ii) your use of the Website will not infringe or misappropriate the intellectual property rights of any third party.
</p>
<h2>17.Indemnification</h2>
<p>
You agree to indemnify and hold harmless CDCK, its contractors, and its licensors, and their respective directors, officers, employees and agents from and against any and all claims and expenses, including attorneys fees, arising out of your use of the Website, including but not limited to your violation of this Agreement.
You agree to indemnify and hold harmless <%= @company_shortname %>, its contractors, and its licensors, and their respective directors, officers, employees and agents from and against any and all claims and expenses, including attorneys fees, arising out of your use of the Website, including but not limited to your violation of this Agreement.
</p>
<h2>18. Miscellaneous</h2>
<p>
This Agreement constitutes the entire agreement between CDCK and you concerning the subject matter hereof, and they may only be modified by a written amendment signed by an authorized executive of CDCK, or by the posting by CDCK of a revised version. Except to the extent applicable law, if any, provides otherwise, this Agreement, any access to or use of the Website will be governed by the laws of the state of California, U.S.A., excluding its conflict of law provisions, and the proper venue for any disputes arising out of or relating to any of the same will be the state and federal courts located in San Francisco County, California. Except for claims for injunctive or equitable relief or claims regarding intellectual property rights (which may be brought in any competent court without the posting of a bond), any dispute arising under this Agreement shall be finally settled in accordance with the Comprehensive Arbitration Rules of the Judicial Arbitration and Mediation Service, Inc. (“JAMS”) by three arbitrators appointed in accordance with such Rules. The arbitration shall take place in San Francisco, California, in the English language and the arbitral decision may be enforced in any court. The prevailing party in any action or proceeding to enforce this Agreement shall be entitled to costs and attorneys fees. If any part of this Agreement is held invalid or unenforceable, that part will be construed to reflect the parties original intent, and the remaining portions will remain in full force and effect. A waiver by either party of any term or condition of this Agreement or any breach thereof, in any one instance, will not waive such term or condition or any subsequent breach thereof. You may assign your rights under this Agreement to any party that consents to, and agrees to be bound by, its terms and conditions; CDCK may assign its rights under this Agreement without condition. This Agreement will be binding upon and will inure to the benefit of the parties, their successors and permitted assigns.
This Agreement constitutes the entire agreement between <%= @company_shortname %> and you concerning the subject matter hereof, and they may only be modified by a written amendment signed by an authorized executive of <%= @company_shortname %>, or by the posting by <%= @company_shortname %> of a revised version. Except to the extent applicable law, if any, provides otherwise, this Agreement, any access to or use of the Website will be governed by the laws of the state of California, U.S.A., excluding its conflict of law provisions, and the proper venue for any disputes arising out of or relating to any of the same will be the state and federal courts located in San Francisco County, California. Except for claims for injunctive or equitable relief or claims regarding intellectual property rights (which may be brought in any competent court without the posting of a bond), any dispute arising under this Agreement shall be finally settled in accordance with the Comprehensive Arbitration Rules of the Judicial Arbitration and Mediation Service, Inc. (“JAMS”) by three arbitrators appointed in accordance with such Rules. The arbitration shall take place in San Francisco, California, in the English language and the arbitral decision may be enforced in any court. The prevailing party in any action or proceeding to enforce this Agreement shall be entitled to costs and attorneys fees. If any part of this Agreement is held invalid or unenforceable, that part will be construed to reflect the parties original intent, and the remaining portions will remain in full force and effect. A waiver by either party of any term or condition of this Agreement or any breach thereof, in any one instance, will not waive such term or condition or any subsequent breach thereof. You may assign your rights under this Agreement to any party that consents to, and agrees to be bound by, its terms and conditions; <%= @company_shortname %> may assign its rights under this Agreement without condition. This Agreement will be binding upon and will inure to the benefit of the parties, their successors and permitted assigns.
</p>

View File

@ -1,7 +1,8 @@
<h2>
<a href="<%= @topic_view.relative_url %>"><%= @topic_view.title %></a>
</h2>
<hr/>
<% @topic_view.posts.each do |post| %>
<div class='creator'>
#<%=post.post_number%> By: <b><%= post.user.name %></b>, <%= post.created_at.to_formatted_s(:long_ordinal) %>
@ -9,14 +10,17 @@
<div class='post'>
<%= post.cooked.html_safe %>
</div>
<hr/>
<% end %>
<% if @topic_view.next_page %>
<p>
<b><a href="<%= @topic_view.next_page_path %>">next page</a></b>
<a href="<%= @topic_view.next_page_path %>">next page &rarr;</a>
</p>
<% end %>
<%- content_for :canonical do %>
<%= "#{request.protocol}#{request.host_with_port}#{@topic_view.canonical_path}" %>
<%- end %>
<p>Powered by <a href="http://www.discourse.org">Discourse</a>, best viewed with JavaScript enabled</p>

View File

@ -316,7 +316,7 @@ en:
# This section is exported to the javascript for i18n in the admin section
admin_js:
type_to_filter: "Type to Filter..."
type_to_filter: "type to filter..."
admin:
title: 'Discourse Admin'
@ -474,19 +474,19 @@ en:
activity_stream: "Activity"
preferences: "Preferences"
bio: "About me"
change_password: "change password"
change_password: "change"
invited_by: "Invited By"
trust_level: "Trust Level"
change_username:
action: "change username"
action: "change"
title: "Change Username"
confirm: "There could be consequences to changing your username. Are you absolutely sure you want to?"
taken: "Sorry that username is taken."
error: "There was an error changing your username."
invalid: "That username is invalid. It must only include numbers and letters"
change_email:
action: 'change email'
action: 'change'
title: "Change Email"
taken: "Sorry that email is not available."
error: "There was an error changing your email. Perhaps that address is already in use?"
@ -526,7 +526,7 @@ en:
website: "Web Site"
email_settings: "Email"
email_digests:
title: "Receive an email digest of what's new"
title: "When I don't visit the site, send me an email digest of what's new"
daily: "daily"
weekly: "weekly"
bi_weekly: "every two weeks"
@ -1128,7 +1128,7 @@ en:
However, if the post is hidden by the community a second time, the moderators will be notified -- and there may be further action, including the possible suspension of your account.
For additional guidance, please refer to our [FAQ](/faq).
For additional guidance, please refer to our [FAQ](%{base_url}/faq).
usage_tips:
text_body_template: |
@ -1178,7 +1178,7 @@ en:
%{new_user_tips}
We believe in [civilized community behavior](/faq) at all times.
We believe in [civilized community behavior](%{base_url}/faq) at all times.
Enjoy your stay!
@ -1191,7 +1191,7 @@ en:
%{new_user_tips}
We believe in [civilized community behavior](/faq) at all times.
We believe in [civilized community behavior](%{base_url}/faq) at all times.
Enjoy your stay!
@ -1212,34 +1212,12 @@ en:
%{new_user_tips}
We believe in [civilized community behavior](/faq) at all times.
We believe in [civilized community behavior](%{base_url}/faq) at all times.
Enjoy your stay!
[prefs]: %{user_preferences_url}
flag_threshold_reached:
subject_template: "Posting Hidden due to Community Flagging"
text_body_template: |
Hello,
This is an automated message from (Community Name) to inform you that the following post was hidden as a result of community flagging:
(onebox of actual flagged post goes here)
Your post was hidden for this flag reason:
> (Largest Flag vote category name goes here, and brief description from the flag dialog, and link. Vote counts are not displayed.)
Keep in mind that it took multiple community members to flag this item before it was hidden. Consider how you might change your post to reflect their feedback.
You can edit the post after (x) minutes, and it will be automatically unhidden. This will increase your forum trust level.
However, if the post is hidden by the community a second time, the moderators will be notified and there may be further action, including the possible suspension of your account.
For additional guidance, [refer to our FAQ](/faq).
export_succeeded:
subject_template: "Export completed successfully"
text_body_template: "The export was successful."