Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
O
osticket
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
docker
osticket
Commits
f83fcf47
Commit
f83fcf47
authored
9 years ago
by
Jared Hancock
Browse files
Options
Downloads
Patches
Plain Diff
org: Add help tips for ticket sharing, email domain
parent
f6ccc3f6
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
include/i18n/en_US/help/tips/org.yaml
+36
-0
36 additions, 0 deletions
include/i18n/en_US/help/tips/org.yaml
include/staff/templates/org-profile.tmpl.php
+3
-2
3 additions, 2 deletions
include/staff/templates/org-profile.tmpl.php
with
39 additions
and
2 deletions
include/i18n/en_US/help/tips/org.yaml
0 → 100644
+
36
−
0
View file @
f83fcf47
#
# This is the view / management page for an organization in the user
# directory
#
# Fields:
# title - Shown in bold at the top of the popover window
# content - The body of the help popover
# links - List of links shows below the content
# title - Link title
# href - href of link (links starting with / are translated to the
# helpdesk installation path)
#
# The key names such as 'helpdesk_name' should not be translated as they
# must match the HTML #ids put into the page template.
#
---
org_sharing
:
title
:
Ticket Sharing
content
:
>
<p>
Organization ticket sharing allows members access to tickets owned
by other members of the organization.
</p>
<p class="info-banner">
<i class="icon-info-sign"></i>
Collaborators always have access to tickets.
</p>
email_domain
:
title
:
Email Domain
content
:
>
Users can be automatically added to this organization based on their
email domain(s). Use the box below to enter one or more domains
separated by commas. For example, enter <code>mycompany.com</code>
for users with email addresses ending in @mycompany.com
This diff is collapsed.
Click to expand it.
include/staff/templates/org-profile.tmpl.php
+
3
−
2
View file @
f83fcf47
...
@@ -20,7 +20,7 @@ if ($info['error']) {
...
@@ -20,7 +20,7 @@ if ($info['error']) {
><i
class=
"icon-fixed-width icon-cogs faded"
></i>
<?php
><i
class=
"icon-fixed-width icon-cogs faded"
></i>
<?php
echo
__
(
'Settings'
);
?>
</a></li>
echo
__
(
'Settings'
);
?>
</a></li>
</ul>
</ul>
<form
method=
"post"
class=
"org"
action=
"
<?php
echo
$action
;
?>
"
>
<form
method=
"post"
class=
"org"
action=
"
<?php
echo
$action
;
?>
"
data-tip-namespace=
"org"
>
<div
id=
"orgprofile_container"
>
<div
id=
"orgprofile_container"
>
<div
class=
"tab_content"
id=
"profile"
style=
"margin:5px;"
>
<div
class=
"tab_content"
id=
"profile"
style=
"margin:5px;"
>
<?php
<?php
...
@@ -111,7 +111,7 @@ if ($ticket && $ticket->getOwnerId() == $user->getId())
...
@@ -111,7 +111,7 @@ if ($ticket && $ticket->getOwnerId() == $user->getId())
<option
value=
"sharing-all"
<?php
echo
$info
[
'sharing-all'
]
?
'selected="selected"'
:
''
;
<option
value=
"sharing-all"
<?php
echo
$info
[
'sharing-all'
]
?
'selected="selected"'
:
''
;
?>
>
<?php
echo
__
(
'All members see all tickets'
);
?>
</option>
?>
>
<?php
echo
__
(
'All members see all tickets'
);
?>
</option>
</select>
</select>
<i
class=
"help-tip icon-question-sign"
href=
"#org
-
sharing"
></i>
<i
class=
"help-tip icon-question-sign"
href=
"#org
_
sharing"
></i>
</td>
</td>
</tr>
</tr>
<tr>
<tr>
...
@@ -140,6 +140,7 @@ if ($ticket && $ticket->getOwnerId() == $user->getId())
...
@@ -140,6 +140,7 @@ if ($ticket && $ticket->getOwnerId() == $user->getId())
<tr>
<tr>
<th
colspan=
"2"
>
<th
colspan=
"2"
>
<?php
echo
__
(
'Email Domain'
);
?>
<?php
echo
__
(
'Email Domain'
);
?>
<i
class=
"help-tip icon-question-sign"
href=
"#email_domain"
></i>
</th>
</th>
</tr>
</tr>
<tr>
<tr>
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment