Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-05-29 15:12:34 +02:00
Code Issues Projects Releases Wiki Activity

2017-12-07 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Rearranged the 'Edit User' dialog in rdadmin(1) to improve
	functional groups of controls.
This commit is contained in:
Fred Gleason 2017-12-07 11:11:32 -05:00
parent b8518d2ddd
commit a19799f0e6
11 changed files with 85 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -16423,3 +16423,6 @@
2017-12-07 Fred Gleason <fredg@paravelsystems.com>
* Moved the 'RML' and 'Utilities' chapters of the Operations Guide
to the 'Rivendell Administration' section.
2017-12-07 Fred Gleason <fredg@paravelsystems.com>
* Rearranged the 'Edit User' dialog in rdadmin(1) to improve
functional groups of controls.

BIN
docs/opsguide/rdadmin.user_dialog.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 44 KiB

After

Width:  |  Height:  |  Size: 44 KiB

16
docs/opsguide/rdadmin.xml
View File

@ -55,7 +55,7 @@
Two different types of user exist within Rivendell:
<emphasis>administrator</emphasis> users (those which have the
<computeroutput>Administer System</computeroutput> right set), who
are allowed to login into RDAdmin, and
are allowed to log into RDAdmin, and
<emphasis>operational</emphasis> users, who are configured to have
rights to operate specific portions of the Rivendell system but do
not have access to RDAdmin. It is not possible for a single user to
@ -83,7 +83,7 @@
The upper third of the the dialog provides fields for basic information
regarding the user as well as authentication settings. If the
<computeroutput>Authenticate This User Locally</computeroutput> box
is ticked, then the login password for this use can be set by touching
is ticked, then the login password for this user can be set by touching
the <computeroutput>Change Password</computeroutput> button. If
unticked, then authentication is delegated to the Pluggable
Authentication Module (PAM) specified in the
@ -93,7 +93,7 @@
The <computeroutput>WebAPI Timeout:</computeroutput> field sets the
timeout (in seconds) when connecting to Rivendell's WebAPI
component, while the <computeroutput>Allow Web Logins</computeroutput>
box, if ticked, permits this user to use the web comonent of
box, if ticked, permits this user to use the web component of
RDCastManager.
</para>
<para>
@ -105,12 +105,16 @@
self-explanatory.
</para>
<para>
The bottom of the dialog contains two large buttons. The
The bottom of the dialog contains three large buttons. The
<computeroutput>Assign Group Permissions</computeroutput> button
allows assignment of the specific groups which this user will be
allowed to access in RDLibrary, while the
allowed to access in RDLibrary,
the <computeroutput>Service Permissions</computeroutput> allows
assignment of the services which this user will be allowed to
access in RDLogEdit and the
<computeroutput>Assign Podcast Feed Permissions</computeroutput>
does the same for Podcast Feeds.
allows the assignment of the podcast feeds which this user will
be allowed to manage in RDCastManager.
</para>
<para>
Touch the <computeroutput>OK</computeroutput> button to commit any

67
rdadmin/edit_user.cpp
View File

@ -106,16 +106,28 @@ EditUser::EditUser(const QString &user,QWidget *parent)
user_description_label->setFont(font);
user_description_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix);
//
// User Phone
//
user_phone_edit=new QLineEdit(this);
user_phone_edit->setGeometry(120,75,sizeHint().width()-130,19);
user_phone_edit->setMaxLength(20);
user_phone_edit->setValidator(validator);
QLabel *user_phone_label=new QLabel(user_phone_edit,tr("&Phone:"),this);
user_phone_label->setGeometry(10,75,105,19);
user_phone_label->setFont(font);
user_phone_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix);
//
// Local Authentication
//
user_localauth_check=new QCheckBox(this);
user_localauth_check->setGeometry(20,75,15,15);
user_localauth_check->setGeometry(20,97,15,15);
connect(user_localauth_check,SIGNAL(toggled(bool)),
this,SLOT(localAuthToggledData(bool)));
user_localauth_label=new QLabel(user_localauth_check,
tr("Authenticate This User Locally"),this);
user_localauth_label->setGeometry(40,75,180,19);
user_localauth_label->setGeometry(40,97,180,19);
user_localauth_label->setFont(font);
user_localauth_label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix);
@ -123,11 +135,11 @@ EditUser::EditUser(const QString &user,QWidget *parent)
// PAM Service
//
user_pamservice_edit=new QLineEdit(this);
user_pamservice_edit->setGeometry(120,97,150,19);
user_pamservice_edit->setGeometry(120,119,150,19);
user_pamservice_edit->setMaxLength(32);
user_pamservice_label=
new QLabel(user_pamservice_edit,tr("PAM Service")+":",this);
user_pamservice_label->setGeometry(10,97,105,19);
user_pamservice_label->setGeometry(10,119,105,19);
user_pamservice_label->setFont(font);
user_pamservice_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix);
@ -135,23 +147,11 @@ EditUser::EditUser(const QString &user,QWidget *parent)
// Change Password Button
//
user_password_button=new QPushButton(this);
user_password_button->setGeometry(sizeHint().width()-90,75,80,50);
user_password_button->setGeometry(sizeHint().width()-90,97,80,50);
user_password_button->setFont(font);
user_password_button->setText(tr("Change\n&Password"));
connect(user_password_button,SIGNAL(clicked()),this,SLOT(passwordData()));
//
// User Phone
//
user_phone_edit=new QLineEdit(this);
user_phone_edit->setGeometry(120,119,120,19);
user_phone_edit->setMaxLength(20);
user_phone_edit->setValidator(validator);
QLabel *user_phone_label=new QLabel(user_phone_edit,tr("&Phone:"),this);
user_phone_label->setGeometry(10,119,105,19);
user_phone_label->setFont(font);
user_phone_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix);
//
// WebAPI Authorization Timeout
//
@ -165,21 +165,22 @@ EditUser::EditUser(const QString &user,QWidget *parent)
user_webapi_auth_label->setFont(font);
user_webapi_auth_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix);
/*
//
// Enable Web Login
//
user_web_box=new QCheckBox(this);
user_web_box->setGeometry(20,162,15,15);
user_web_label=new QLabel(user_web_box,tr("Allow Web Logins"),this);
user_web_label->setGeometry(40,162,180,19);
user_web_label=new QLabel(user_web_box,tr("Allow RDCastManager Web Logins"),this);
user_web_label->setGeometry(40,162,sizeHint().width()-50,19);
user_web_label->setFont(font);
user_web_label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix);
*/
//
// Administrative Group Priviledges
//
user_admin_group=new QButtonGroup(tr("Administrative Rights"),this);
user_admin_group->setGeometry(10,191,355,45);
user_admin_group->setGeometry(10,170,355,45);
user_admin_group->setFont(font);
user_admin_config_button=new QCheckBox(user_admin_group);
@ -198,7 +199,7 @@ EditUser::EditUser(const QString &user,QWidget *parent)
// Production Group Priviledges
//
user_prod_group=new QButtonGroup(tr("Production Rights"),this);
user_prod_group->setGeometry(10,246,355,85);
user_prod_group->setGeometry(10,225,355,85);
user_prod_group->setFont(font);
user_create_carts_button=new QCheckBox(user_prod_group);
@ -255,7 +256,7 @@ EditUser::EditUser(const QString &user,QWidget *parent)
// Traffic Group Priviledges
//
user_traffic_group=new QButtonGroup(tr("Traffic Rights"),this);
user_traffic_group->setGeometry(10,341,355,66);
user_traffic_group->setGeometry(10,320,355,66);
user_traffic_group->setFont(font);
user_create_log_button=new QCheckBox(user_traffic_group);
@ -296,7 +297,7 @@ EditUser::EditUser(const QString &user,QWidget *parent)
// OnAir Group Priviledges
//
user_onair_group=new QButtonGroup(tr("OnAir Rights"),this);
user_onair_group->setGeometry(10,417,355,85);
user_onair_group->setGeometry(10,396,355,85);
user_onair_group->setFont(font);
user_playout_log_button=new QCheckBox(user_onair_group);
@ -346,7 +347,7 @@ EditUser::EditUser(const QString &user,QWidget *parent)
// Podcast Group Priviledges
//
user_podcast_group=new QButtonGroup(tr("Podcasting Rights"),this);
user_podcast_group->setGeometry(10,512,355,66);
user_podcast_group->setGeometry(10,491,355,66);
user_podcast_group->setFont(font);
user_add_podcast_button=new QCheckBox(user_podcast_group);
@ -375,11 +376,19 @@ EditUser::EditUser(const QString &user,QWidget *parent)
user_delete_podcast_label->setFont(small_font);
user_delete_podcast_label->setAlignment(AlignLeft|ShowPrefix);
user_web_box=new QCheckBox(user_podcast_group);
user_web_box->setGeometry(172,42,15,15);
user_web_label=new QLabel(user_web_box,tr("Allow Web Login"),
user_podcast_group);
user_web_label->setGeometry(192,42,150,19);
user_web_label->setFont(small_font);
user_web_label->setAlignment(AlignLeft|ShowPrefix);
//
// Group Permissions Button
//
user_assign_perms_button=new QPushButton(this);
user_assign_perms_button->setGeometry(10,582,sizeHint().width()/3-20,50);
user_assign_perms_button->setGeometry(10,561,sizeHint().width()/3-20,50);
user_assign_perms_button->setFont(font);
user_assign_perms_button->setText(tr("Group\nPermissions"));
connect(user_assign_perms_button,SIGNAL(clicked()),this,SLOT(groupsData()));
@ -388,7 +397,7 @@ EditUser::EditUser(const QString &user,QWidget *parent)
// Services Permissions Button
//
user_assign_svcs_button=new QPushButton(this);
user_assign_svcs_button->setGeometry(sizeHint().width()/3+10,582,sizeHint().width()/3-20,50);
user_assign_svcs_button->setGeometry(sizeHint().width()/3+10,561,sizeHint().width()/3-20,50);
user_assign_svcs_button->setFont(font);
user_assign_svcs_button->setText(tr("Service\nPermissions"));
connect(user_assign_svcs_button,SIGNAL(clicked()),this,SLOT(servicesData()));
@ -398,7 +407,7 @@ EditUser::EditUser(const QString &user,QWidget *parent)
//
user_assign_feeds_button=new QPushButton(this);
user_assign_feeds_button->
setGeometry(2*sizeHint().width()/3+10,582,sizeHint().width()/3-20,50);
setGeometry(2*sizeHint().width()/3+10,561,sizeHint().width()/3-20,50);
user_assign_feeds_button->setFont(font);
user_assign_feeds_button->setText(tr("Podcast Feed\nPermissions"));
connect(user_assign_feeds_button,SIGNAL(clicked()),this,SLOT(feedsData()));
@ -489,7 +498,7 @@ EditUser::~EditUser()
QSize EditUser::sizeHint() const
{
return QSize(375,702);
return QSize(375,681);
}

6
rdadmin/rdadmin_cs.ts
View File

@ -4092,7 +4092,7 @@ uloženo. Uložit nyní?</translation>
</message>
<message>
<source>Allow Web Logins</source>
<translation>Dovolit webová přihlášení</translation>
<translation type="obsolete">Dovolit webová přihlášení</translation>
</message>
<message>
<source>Change
@ -4247,6 +4247,10 @@ Permissions</source>
Permissions</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Allow Web Login</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>EditUserPerms</name>

6
rdadmin/rdadmin_de.ts
View File

@ -4049,7 +4049,7 @@ gespeichert werden. Jetzt speichern?</translation>
</message>
<message>
<source>Allow Web Logins</source>
<translation>Web-Logins erlauben</translation>
<translation type="obsolete">Web-Logins erlauben</translation>
</message>
<message>
<source>Change
@ -4204,6 +4204,10 @@ Permissions</source>
Permissions</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Allow Web Login</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>EditUserPerms</name>

6
rdadmin/rdadmin_es.ts
View File

@ -4159,7 +4159,7 @@ Feeds para Podcasts</translation>
</message>
<message>
<source>Allow Web Logins</source>
<translation>Permitir ingreso vía Web</translation>
<translation type="obsolete">Permitir ingreso vía Web</translation>
</message>
<message>
<source>Disabled</source>
@ -4192,6 +4192,10 @@ Permissions</source>
Permissions</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Allow Web Login</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>EditUserPerms</name>

8
rdadmin/rdadmin_fr.ts
View File

@ -3628,10 +3628,6 @@ must be saved. Save now?</source>
<source>&amp;Phone:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Allow Web Logins</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Change
&amp;Password</source>
@ -3772,6 +3768,10 @@ Permissions</source>
Permissions</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Allow Web Login</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>EditUserPerms</name>

6
rdadmin/rdadmin_nb.ts
View File

@ -4019,7 +4019,7 @@ Lagre no?</translation>
</message>
<message>
<source>Allow Web Logins</source>
<translation>Gje høve til pålogging frå nettet</translation>
<translation type="obsolete">Gje høve til pålogging frå nettet</translation>
</message>
<message>
<source>Change
@ -4174,6 +4174,10 @@ Permissions</source>
Permissions</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Allow Web Login</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>EditUserPerms</name>

6
rdadmin/rdadmin_nn.ts
View File

@ -4019,7 +4019,7 @@ Lagre no?</translation>
</message>
<message>
<source>Allow Web Logins</source>
<translation>Gje høve til pålogging frå nettet</translation>
<translation type="obsolete">Gje høve til pålogging frå nettet</translation>
</message>
<message>
<source>Change
@ -4174,6 +4174,10 @@ Permissions</source>
Permissions</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Allow Web Login</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>EditUserPerms</name>

6
rdadmin/rdadmin_pt_BR.ts
View File

@ -4042,7 +4042,7 @@ deve ser salva. Salvar Agora?</translation>
</message>
<message>
<source>Allow Web Logins</source>
<translation>Permitir Login Online</translation>
<translation type="obsolete">Permitir Login Online</translation>
</message>
<message>
<source>Change
@ -4197,6 +4197,10 @@ Permissions</source>
Permissions</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Allow Web Login</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>EditUserPerms</name>