github/reddit
1
1
Fork 0
mirror of https://github.com/reddit-archive/reddit.git synced 2026-04-27 03:00:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add trademark text when creating subreddit

Browse Source 
Add trademark text and new description on create subreddit form, as per mockup
This commit is contained in:
scarow
2016-03-10 16:15:29 -08:00
parent 30be5f5dd0
commit c393ffc488
3 changed files with 26 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
r2/r2/public/static/css/reddit.less
View File

@@ -5219,7 +5219,11 @@ ul.tabmenu.formtab {
}
.linefield span + span {
margin-left: 10px;
margin-left: 10px;
}
.linefield .linefield-description {
display: block;
}
ul.colors {

36
r2/r2/templates/createsubreddit.html
View File

@@ -51,28 +51,32 @@ try participating in other communities on reddit for a little while first before
%if not thing.site:
<%utils:line_field title="${_('name')}"
description='${_("no spaces, e.g., slashdot")}'>
<input type="text" name="name" id="name" class="text"
value="${thing.name}"/>
%if not thing.site:
${error_field("SUBREDDIT_EXISTS", "name")}
${error_field("BAD_SR_NAME", "name")}
%endif
description='${_("no spaces, e.g., \"books\" or \"bookclub\". avoid using solely trademarked names, e.g. use \"FansOfAcme\" instead of \"Acme\". once chosen, this name cannot be changed.")}'>
<div class="usertext-edit">
<input type="text" name="name" id="name" class="text"
value="${thing.name}"/>
%if not thing.site:
${error_field("SUBREDDIT_EXISTS", "name")}
${error_field("BAD_SR_NAME", "name")}
%endif
</div>
</%utils:line_field>
%else:
<input type="hidden" name="sr" id="name" value="${thing.site._fullname}"/>
%endif
<%utils:line_field title="${_('title')}"
description='${_("e.g., slashdot: news for nerds, stuff that matters")}'>
%if thing.site:
<input id="title" type="text" name="title" class="text"
value="${thing.site.title}"/>
%else:
<input id="title" type="text" name="title" class="text" />
%endif
${error_field("NO_TEXT", "title")}
${error_field("TOO_LONG", "title")}
description='${_("e.g., books: made from trees or pixels. recommendations, news, or thoughts")}'>
<div class="usertext-edit">
%if thing.site:
<input id="title" type="text" name="title" class="text"
value="${thing.site.title}"/>
%else:
<input id="title" type="text" name="title" class="text" />
%endif
${error_field("NO_TEXT", "title")}
${error_field("TOO_LONG", "title")}
</div>
</%utils:line_field>
<%utils:line_field title="${_('description')}" css_class="usertext"

2
r2/r2/templates/utils.html
View File

@@ -558,7 +558,7 @@ ${unsafe(txt)}
<span class="title">${title}</span>
&#32;
%if description:
<span class="little gray">${description}</span>
<span class="little gray ${kind}-description">${description}</span>
%endif
<div class="${kind}-content">
${caller.body()}