Skip to content

Pf 82 - Pitchfork Doc/Code update #85

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bapril merged 4 commits into from
Feb 23, 2017
Merged

Pf 82 - Pitchfork Doc/Code update #85

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c92276a
Page_show -> PageShow
massar Feb 21, 2017
bd8871b
Use GetPriEmail instead of the String variant + update 'E-mail Addres…
massar Feb 23, 2017
f5b1b00
Merge branch 'PageShow' of github.com:tridentli/trident into pf_82
massar Feb 23, 2017
350baf0
tweak some test values
bapril Feb 23, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions doc/Trident.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ With formatting:
[WikiPage](WikiPage/)
[WikiPage](WikiPage/)
[External Site](https://example.net)
[Email Address](mailto:user@example.net)
[Email address](mailto:user@example.net)
```

##### Importing from other Wikis (FosWiki)
Expand Down Expand Up @@ -544,7 +544,7 @@ server {
}
```

### E-mail setup
### Email setup

Trident can be run behind both Postfix and Sendmail or likely other SMTP servers.

Expand Down
2 changes: 1 addition & 1 deletion share/dbschemas/test_data.psql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ INSERT INTO trustgroup (ident, shortname, descr, min_invouch, target_invouch,
INSERT into attestations (ident,descr,trustgroup)
VALUES ('know','LONG DESCRIPTION','test2');

-- Add E-mail addresses
-- Add Email addresses
INSERT INTO member_email (member, email, verified)
VALUES ('testuser', 'test@user.com', true);
INSERT INTO member_email (member, email, verified)
Expand Down
2 changes: 1 addition & 1 deletion share/templates/group/nominate.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
{{ if $user.GetHideEmail }}
[Email Hidden]
{{ else }}
{{ $user.GetPriEmailString $.UI false }}
{{ ($user.GetPriEmail $.UI false).Email }}
{{ end }}
</td>
<td>{{ $user.GetAffiliation }}</td>
Expand Down
2 changes: 1 addition & 1 deletion share/templates/user/profile_vouches.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<h1>Group {{ .Group.GetGroupName }}</h1>
<table>
<tbody>
<tr><th>E-mail Address:</th><td>{{ $user.GetPriEmailString $.UI false }}</td></tr>
<tr><th>Email address:</th><td>{{ ($user.GetPriEmail $.UI false).Email }}</td></tr>
</tbody>
</table>

Expand Down
2 changes: 1 addition & 1 deletion share/test/case_create_tg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@
<tr>
<td>assertText</td>
<td>id=-message</td>
<td>Updated 2 fields, 13 fields where not modified</td>
<td>Updated 2 fields, 14 fields where not modified</td>
</tr>
<tr>
<td>clickAndWait</td>
Expand Down
2 changes: 1 addition & 1 deletion share/test/case_ml_subscribe
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@
<tr>
<td>assertText</td>
<td>id=PfML-message</td>
<td>5 fields where not modified</td>
<td>9 fields where not modified</td>
</tr>
<tr>
<td>clickAndWait</td>
Expand Down
2 changes: 1 addition & 1 deletion share/test/case_nomination
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@
<tr>
<td>assertText</td>
<td>id=-message</td>
<td>Updated 5 fields, 10 fields where not modified</td>
<td>Updated 5 fields, 11 fields where not modified</td>
</tr>
<tr>
<td>clickAndWait</td>
Expand Down
2 changes: 1 addition & 1 deletion share/test/case_profile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@
<tr>
<td>assertText</td>
<td>id=-message</td>
<td>Updated 8 fields, 9 fields where not modified</td>
<td>Updated 8 fields, 14 fields where not modified</td>
</tr>
<tr>
<td>clickAndWait</td>
Expand Down
8 changes: 4 additions & 4 deletions src/ui/group.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ func h_group_member(cui pu.PfUI) {
isadmin := cui.IAmGroupAdmin()

p := Page{cui.Page_def(), grp, members, offset, total, search, isadmin}
cui.Page_show("group/members.tmpl", p)
cui.PageShow("group/members.tmpl", p)
}

type NominateAdd struct {
Expand Down Expand Up @@ -119,7 +119,7 @@ func h_group_nominate_existing(cui pu.PfUI) {
na := &NominateAdd{group: grp, Vouchee: vouchee.GetUserName(), Action: "nominate", Message: msg, Error: errmsg}

p := Page{cui.Page_def(), vouchee.GetUserName(), grp.GetGroupName(), na}
cui.Page_show("group/nominate_existing.tmpl", p)
cui.PageShow("group/nominate_existing.tmpl", p)
}

type NominateNew struct {
Expand Down Expand Up @@ -219,7 +219,7 @@ func h_group_nominate(cui pu.PfUI) {
newform := &NominateNew{group: grp, Action: "nominate", Email: search, Message: msg, Error: errmsg, Search: search, FullName: descr, Affiliation: affil, Biography: bio, Comment: comment}

p := Page{cui.Page_def(), search, grp.GetGroupName(), list, notfound, newform}
cui.Page_show("group/nominate.tmpl", p)
cui.PageShow("group/nominate.tmpl", p)
}

func h_vouches_csv(cui pu.PfUI) {
Expand Down Expand Up @@ -268,7 +268,7 @@ func h_vouches(cui pu.PfUI) {
}

p := Page{cui.Page_def(), vouches}
cui.Page_show("group/vouches.tmpl", p)
cui.PageShow("group/vouches.tmpl", p)
}

func h_group(cui pu.PfUI, menu *pu.PfUIMenu) {
Expand Down
2 changes: 1 addition & 1 deletion src/ui/recover.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,5 +83,5 @@ func h_recover(cui pu.PfUI) {
"</p>\n")

p := Page{cui.Page_def(), intro, rec{usr, usp, nmp, "", "", "", msg, errmsg}, msg, errmsg}
cui.Page_show("misc/recover.tmpl", p)
cui.PageShow("misc/recover.tmpl", p)
}
2 changes: 1 addition & 1 deletion src/ui/user.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,5 +167,5 @@ func h_user_vouches(cui pu.PfUI) {
p.Error += err.Error()
}

cui.Page_show("user/profile_vouches.tmpl", p)
cui.PageShow("user/profile_vouches.tmpl", p)
}
2 changes: 1 addition & 1 deletion src/ui/vcp.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,5 +156,5 @@ func h_group_vcp(cui pu.PfUI) {
}

p := Page{cui.Page_def(), offset, total, cui.SelectedGroup().GetGroupName(), vcps, action, criteria, criterias, limit, limits}
cui.Page_show("group/vcp.tmpl", p)
cui.PageShow("group/vcp.tmpl", p)
}