Skip to content

Commit

Permalink
Finish homepage translation. #513
Browse files Browse the repository at this point in the history
  • Loading branch information
Bill Hunt committed Oct 26, 2015
1 parent 015a021 commit 19546ec
Show file tree
Hide file tree
Showing 3 changed files with 50 additions and 27 deletions.
13 changes: 12 additions & 1 deletion public/locales/en_US.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,15 @@
"menu.nav.signup": "Sign Up",
"menu.nav.logout": "Logout",
"menu.nav.toggle": "Toggle navigation",
"menu.nav.accountwelcome": "Welcome {{ name }}",
"menu.nav.documents": "My Documents",
"menu.nav.settings": "Account Settings",
"menu.nav.notifications": "Notification Settings",
"menu.nav.groupmanagement": "Group Management",
"menu.nav.admin": "Administrative Dashboard",
"menu.nav.actas": "Use Madison As",
"menu.nav.actingas": "Using Madison as:",
"menu.nav.removegroup": "Remove Active Group",

"footer.tagline": "<ul class=\"for-roles\"><li>for <span class=\"for-role\">Citizens</span></li><li>for <span class=\"for-role\">Authors</span></li><li>for <span class=\"for-role\">Developers</span></li></ul>",

Expand All @@ -36,6 +45,7 @@

"form.search.title": "Search All Documents:",
"form.search.placeholder": "Search titles",
"form.search.categoryheading": "Displaying:",

"document.interface.readmore": "Read More",
"document.interface.readmoretitle": "Read more of {{title}}",
Expand All @@ -44,6 +54,7 @@
"document.title.activelegislation": "Active Legislation",
"document.title.recentactivity": "Recent Activity",
"document.title.mostactive": "Most Active Documents",
"document.title.recentlegislation": "Recent Legislation",

"document.label.quotedtitle": "&quot;{{ title }}&quot;",
"document.label.sponsoredby": "Sponsored by",
Expand All @@ -56,5 +67,5 @@
"document.label.created.timeago": "Created <time class=\"created doc-updated-date\" datetime=\"{{ datetime }}\">{{ datetime | timeAgo }}</time>",

"home.intro.title": "Add your voice...",
"home.intro.text": "Find legislation and regulations being developed and get informed. Then get involved and collaboratively craft the documents with the sponsors. To get started, choose from the recent documents below, or search the whole repository."
"home.intro.text": "<p>Find legislation and regulations being developed and get informed. Then get involved and collaboratively craft the documents with the sponsors. To get started, choose from the recent documents below, or search the whole repository.</p>"
}
26 changes: 10 additions & 16 deletions public/templates/pages/home.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,24 +3,17 @@
<section ng-include="'/templates/partials/featured.html'"></section>

<aside class="search-list">
<h2 class="heading">Add your voice...</h2>
<div>
<p>
Find legislation and regulations being developed and
get informed. Then get involved and collaboratively craft the documents
with the sponsors. To get started, choose from the recent documents
below, or search the whole repository.
</p>
</div>
<h2 class="heading" translate="home.intro.title"></h2>
<div translate="home.intro.text"></div>
<section class="search-form">
<div>
<h3 class="normal-title" for="doc-text-filter">
Search all documents:
</h3>
<button class="search-button" type="submit">Submit</button>
<h3 class="normal-title" for="doc-text-filter"
translate="form.search.title"></h3>

<button class="search-button" type="submit" translate="form.general.submit"></button>
<span class="text-search">
<input id="doc-text-filter" type="text" ng-model="docSearch"
class="" placeholder="Search titles" />
class="" placeholder="{{ 'form.search.placeholder' | translate }}" />
</span>
</div>
<!--div class="home-select2-container">
Expand Down Expand Up @@ -51,9 +44,10 @@ <h3 class="normal-title" for="doc-text-filter">
</div-->
</section>
<section class="doc-results-list">
<h2 class="normal-title">Recent Legislation</h2>
<h2 class="normal-title"
translate="document.title.recentlegislation"></h2>
<div class="category-filter" ng-if="selectedCategory">
Displaying:
<span translate="form.search.categoryheading"></span>
<div class="category" ng-click="clearCategoryFilter()"><span>{{ selectedCategory.name }}</span></div>
<a class="clear-category" ng-click="clearCategoryFilter()">Clear</a>
</div>
Expand Down
38 changes: 28 additions & 10 deletions public/templates/partials/account-dropdown.html
Original file line number Diff line number Diff line change
@@ -1,24 +1,42 @@
<a class="dropdown-trigger" href="#" data-toggle="dropdown">Welcome {{ user.display_name }} <span class="caret"></span></a>
<a class="dropdown-trigger" href="#" data-toggle="dropdown">
<span translate="menu.nav.accountwelcome"
translate-values="{ name: user.display_name }"></span>
<span class="caret"></span></a>
<ul class="dropdown-menu" role="menu">
<li class="link-settings"><a href="/documents">My Documents</a>
<li class="link-settings"><a href="/user/edit/{{ user.id }}">Account Settings</a></li>
<li><a href="/user/edit/{{ user.id }}/notifications">Notification Settings</a></li>
<li class="link-settings"><a href="/groups">Group Management</a></li>
<li ng-if="user.admin"><a href="/administrative-dashboard">Administrative Dashboard</a></li>
<li class="link-settings">
<a href="/documents" translate="menu.nav.documents"></a>
</li>
<li class="link-settings">
<a href="/user/edit/{{ user.id }}" translate="menu.nav.settings"></a>
</li>
<li>
<a href="/user/edit/{{ user.id }}/notifications" translate="menu.nav.notifications"></a>
</li>
<li class="link-settings">
<a href="/groups" translate="menu.nav.groupmanagement"></a>
</li>
<li ng-if="user.admin">
<a href="/administrative-dashboard" translate="menu.nav.admin"></a>
</li>
<li class="dropdown-submenu pull-left">
<a class="dropdown-trigger" href="#" data-toggle="dropdown">Use Madison As</a>
<a class="dropdown-trigger" href="#" data-toggle="dropdown"
translate="menu.nav.actas"></a>
<ul class="dropdown-menu" role="menu">
<li class="link-settings">
<small>Using Madison as:</small>
<small translate="menu.nav.actingas"></small>
<br>
<span ng-if="!!activeGroup">{{ activeGroup.display_name }}</span>
<span ng-if="!activeGroup">{{ user.display_name }}</span>
</li>
<li ng-repeat="group in groups">
<a ng-click="setActiveGroup(group.id)">{{ group.display_name }}</a>
</li>
<li><a ng-click="removeActiveGroup()">Remove Active Group</a></li>
<li>
<a ng-click="removeActiveGroup()" translate="menu.nav.removegroup"></a>
</li>
</ul>
</li>
<li class="link-logout"><a ng-click="logout()">Logout</a></li>
<li class="link-logout">
<a ng-click="logout()" translate="menu.nav.logout"></a>
</li>
</ul>

0 comments on commit 19546ec

Please sign in to comment.