diff --git a/modules/sysadmin_guide/nav.adoc b/modules/sysadmin_guide/nav.adoc index e813f94..31823d4 100644 --- a/modules/sysadmin_guide/nav.adoc +++ b/modules/sysadmin_guide/nav.adoc @@ -111,7 +111,7 @@ ** xref:virt-image.adoc[Fedora Infrastructure Kpartx Notes - SOP] ** xref:virtio.adoc[Virtio Notes - SOP] ** xref:virt-notes.adoc[Fedora Infrastructure Libvirt Notes - SOP] -** xref:voting.adoc[voting - SOP in review ] +** xref:voting.adoc[Voting Infrastructure - SOP] ** xref:waiverdb.adoc[waiverdb - SOP in review ] ** xref:wcidff.adoc[wcidff - SOP in review ] ** xref:wiki.adoc[wiki - SOP in review ] diff --git a/modules/sysadmin_guide/pages/voting.adoc b/modules/sysadmin_guide/pages/voting.adoc index 9019467..d4fa637 100644 --- a/modules/sysadmin_guide/pages/voting.adoc +++ b/modules/sysadmin_guide/pages/voting.adoc @@ -1,8 +1,8 @@ = Voting Infrastructure SOP -The live voting instance can be found at -https://admin.fedoraproject.org/voting and the staging instance at -https://admin.stg.fedoraproject.org/voting/ +The live voting instance can be found at https://admin.fedoraproject.org/voting + +and the staging instance at https://admin.stg.fedoraproject.org/voting/ The code base can be found at http://git.fedorahosted.org/git/?p=elections.git @@ -10,25 +10,17 @@ http://git.fedorahosted.org/git/?p=elections.git == Contents [arabic] -. Contact Information -. Creating a new election - -____ -[arabic] -. Creating the election -. Adding Candidates -. Who can vote -____ - -[arabic, start=3] -. Modifying an Election - -____ -[arabic] -. Changing the details of an Election -. Removing a candidate -. Releasing the results of an embargoed election -____ +* <<_contact_information>> +* <<_creating_a_new_election>> +** <<_creating_the_elections>> +** <<_adding_candidates>> +** <<_who_can_vote>> +* <<_modifying_an_election>> +** <<_edit_a_candidate>> +** <<_removing_a_candidate>> +** <<_releasing_the_results_of_an_embargoed_election>> +* <<_results>> +* <<_legacy>> == Contact Information @@ -36,8 +28,6 @@ Owner:: Fedora Infrastructure Team Contact:: #fedora-admin, elections -Location:: - PHX Servers:: elections0\{1,2}, elections01.stg, db02 Purpose:: @@ -59,13 +49,13 @@ in the link on the page of listed elections on the frontpage. Alias:: A short name for the election. It is the name that will be used in the templates. - + - `Example: FESCo2014` ++ +`Example: FESCo2014` Summary:: A simple name that will be used in the URLs and as in the links in the application - + - `Example: FESCo elections 2014` ++ +`Example: FESCo elections 2014` Description:: A short description about the elections that will be displayed above the choices in the voting page @@ -75,8 +65,8 @@ Maxium Range/Votes:: Allow setting options for some election type (more on that below) URL:: A URL pointing to more information about the election - + - `Example: the wiki page presenting the election` ++ +`Example: the wiki page presenting the election` Start Date:: The Start of the elections (UTC) End Date:: @@ -95,9 +85,9 @@ Legal voters groups:: Admin groups:: Give admin rights on that election to one or more FAS groups -== Adding Candidates +=== Adding Candidates -The list of all the elections can be found at voting/admin/ +The list of all the elections can be found at `voting/admin/` Click on the election of interest and and select "Add a candidate". @@ -110,7 +100,7 @@ themselves. This will add extra candidates to the available list. -== Who can vote +=== Who can vote If no 'Legal voters groups' have been defined when creating the election, the election will be opened to anyone having signed the CLA @@ -121,9 +111,8 @@ and being in one other group (commonly referred to CLA+1). Changing the details of an Election [NOTE] -.Note ==== -this page can also be used to verify details of an election before it +This page can also be used to verify details of an election before it opens for voting. ==== The list of all the elections can be found at `/voting/admin/` @@ -131,21 +120,21 @@ The list of all the elections can be found at `/voting/admin/` After finding the right election, click on it to have the overview and select "Edit election" under the description. -== Edit a candidate +=== Edit a candidate On the election overview page found via `/voting/admin/` (and clicking on the election of interest), next to each candidate is an -[.title-ref]#[edit]# button allowing the admins to edit the information +_edit_ button allowing the admins to edit the information relative to the candidate. -== Removing a candidate +=== Removing a candidate On the election overview page found via `/voting/admin/` (and clicking on the election of interest), next to each candidate is an -[.title-ref]#[x]# button allowing the admins to remove the candidatei +_x_ button allowing the admins to remove the candidatei from the election. -== Releasing the results of an embargoed election +=== Releasing the results of an embargoed election Visit the elections admin interface and edit the election to uncheck the 'Embargo results?' checkbox. @@ -155,7 +144,7 @@ Visit the elections admin interface and edit the election to uncheck the Admins have early access to the results of the elections (regardless of the embargo status). -The list of the closed elections can be found at /voting/archives. +The list of the closed elections can be found at `/voting/archives`. Find there the election of interest and click on the "Results" link in the last column of the table. This will show you the Results page @@ -167,7 +156,6 @@ You may use these information to send out the results email. == Legacy [NOTE] -.Note ==== The information below should now be included in the Results page (see above) but I left them here in case. @@ -180,7 +168,7 @@ database for the extra information. You can use something like this to retrieve the total number of voters for the election: .... -ELECT e.id, e.shortdesc, COUNT(distinct v.voter) FROM elections AS e LEFT +SELECT e.id, e.shortdesc, COUNT(distinct v.voter) FROM elections AS e LEFT JOIN votes AS v ON e.id=v.election_id WHERE e.shortdesc in ('FAmSCo - February 2014') GROUP BY e.id, e.shortdesc; ....