Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
mahara
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
1
Issues
1
List
Boards
Labels
Service Desk
Milestones
Merge Requests
1
Merge Requests
1
Operations
Operations
Incidents
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
mahara
mahara
Commits
629a64e6
Commit
629a64e6
authored
May 28, 2015
by
Naomi Guyer
Committed by
Aaron Wells
Jun 15, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
NEW submenu for tertiary navigation
Bug 1465107: Use Bootstrap CSS Framework Change-Id: I7196464441c27c657820742b2d310de4fb409b2d
parent
63a997cd
Changes
61
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
61 changed files
with
582 additions
and
525 deletions
+582
-525
htdocs/account/activity/index.json.php
htdocs/account/activity/index.json.php
+1
-3
htdocs/admin/extensions/plugins.php
htdocs/admin/extensions/plugins.php
+7
-6
htdocs/admin/upgrade.php
htdocs/admin/upgrade.php
+12
-11
htdocs/artefact/annotation/lib.php
htdocs/artefact/annotation/lib.php
+5
-4
htdocs/artefact/blog/lib.php
htdocs/artefact/blog/lib.php
+2
-2
htdocs/artefact/comment/lib.php
htdocs/artefact/comment/lib.php
+1
-1
htdocs/artefact/file/groupfiles.php
htdocs/artefact/file/groupfiles.php
+1
-0
htdocs/artefact/internal/lib.php
htdocs/artefact/internal/lib.php
+1
-1
htdocs/artefact/multirecipientnotification/indexin.json.php
htdocs/artefact/multirecipientnotification/indexin.json.php
+0
-1
htdocs/artefact/multirecipientnotification/indexout.json.php
htdocs/artefact/multirecipientnotification/indexout.json.php
+0
-2
htdocs/artefact/plans/lib.php
htdocs/artefact/plans/lib.php
+2
-2
htdocs/artefact/resume/lib.php
htdocs/artefact/resume/lib.php
+9
-9
htdocs/auth/webservice/lib.php
htdocs/auth/webservice/lib.php
+11
-8
htdocs/collection/index.php
htdocs/collection/index.php
+15
-2
htdocs/collection/views.php
htdocs/collection/views.php
+2
-0
htdocs/group/members.php
htdocs/group/members.php
+1
-0
htdocs/group/shareviews.php
htdocs/group/shareviews.php
+1
-0
htdocs/group/view.php
htdocs/group/view.php
+3
-0
htdocs/interaction/forum/index.php
htdocs/interaction/forum/index.php
+2
-0
htdocs/interaction/forum/topic.php
htdocs/interaction/forum/topic.php
+6
-4
htdocs/interaction/forum/view.php
htdocs/interaction/forum/view.php
+5
-4
htdocs/lib/web.php
htdocs/lib/web.php
+5
-5
htdocs/theme/bootstrap/artefact/multirecipientnotification/templates/indexout.tpl
...rtefact/multirecipientnotification/templates/indexout.tpl
+2
-2
htdocs/theme/bootstrap/interaction/forum/templates/index.tpl
htdocs/theme/bootstrap/interaction/forum/templates/index.tpl
+106
-107
htdocs/theme/bootstrap/interaction/forum/templates/topic.tpl
htdocs/theme/bootstrap/interaction/forum/templates/topic.tpl
+20
-15
htdocs/theme/bootstrap/interaction/forum/templates/topics.tpl
...cs/theme/bootstrap/interaction/forum/templates/topics.tpl
+37
-29
htdocs/theme/bootstrap/interaction/forum/templates/view.tpl
htdocs/theme/bootstrap/interaction/forum/templates/view.tpl
+50
-52
htdocs/theme/bootstrap/static/fonts/robotoslab/RobotoSlab-Bold.ttf
...eme/bootstrap/static/fonts/robotoslab/RobotoSlab-Bold.ttf
+0
-0
htdocs/theme/bootstrap/static/fonts/robotoslab/RobotoSlab-Light.ttf
...me/bootstrap/static/fonts/robotoslab/RobotoSlab-Light.ttf
+0
-0
htdocs/theme/bootstrap/static/fonts/robotoslab/RobotoSlab-Regular.ttf
.../bootstrap/static/fonts/robotoslab/RobotoSlab-Regular.ttf
+0
-0
htdocs/theme/bootstrap/static/fonts/robotoslab/RobotoSlab-Thin.ttf
...eme/bootstrap/static/fonts/robotoslab/RobotoSlab-Thin.ttf
+0
-0
htdocs/theme/bootstrap/static/sass/components/_arrow-bar.scss
...cs/theme/bootstrap/static/sass/components/_arrow-bar.scss
+54
-0
htdocs/theme/bootstrap/static/sass/components/_btn-group.scss
...cs/theme/bootstrap/static/sass/components/_btn-group.scss
+1
-0
htdocs/theme/bootstrap/static/sass/components/_btn.scss
htdocs/theme/bootstrap/static/sass/components/_btn.scss
+2
-2
htdocs/theme/bootstrap/static/sass/layout/nav/_navbar.scss
htdocs/theme/bootstrap/static/sass/layout/nav/_navbar.scss
+26
-18
htdocs/theme/bootstrap/static/sass/style.scss
htdocs/theme/bootstrap/static/sass/style.scss
+1
-0
htdocs/theme/bootstrap/static/sass/typography/_fonts.scss
htdocs/theme/bootstrap/static/sass/typography/_fonts.scss
+43
-54
htdocs/theme/bootstrap/static/sass/typography/_tables.scss
htdocs/theme/bootstrap/static/sass/typography/_tables.scss
+22
-1
htdocs/theme/bootstrap/static/sass/typography/_typography.scss
...s/theme/bootstrap/static/sass/typography/_typography.scss
+4
-0
htdocs/theme/bootstrap/static/sass/utilities/_bootstrap-variables.scss
...bootstrap/static/sass/utilities/_bootstrap-variables.scss
+1
-1
htdocs/theme/bootstrap/static/style/style.css
htdocs/theme/bootstrap/static/style/style.css
+1
-1
htdocs/theme/bootstrap/static/style/tinymce.css
htdocs/theme/bootstrap/static/style/tinymce.css
+1
-1
htdocs/theme/bootstrap/templates/footer.tpl
htdocs/theme/bootstrap/templates/footer.tpl
+1
-15
htdocs/theme/bootstrap/templates/group/group.tpl
htdocs/theme/bootstrap/templates/group/group.tpl
+3
-3
htdocs/theme/bootstrap/templates/header.tpl
htdocs/theme/bootstrap/templates/header.tpl
+28
-7
htdocs/theme/bootstrap/templates/header/head.tpl
htdocs/theme/bootstrap/templates/header/head.tpl
+1
-0
htdocs/theme/bootstrap/templates/header/navigation.tpl
htdocs/theme/bootstrap/templates/header/navigation.tpl
+0
-18
htdocs/theme/bootstrap/templates/inpagenav.tpl
htdocs/theme/bootstrap/templates/inpagenav.tpl
+2
-2
htdocs/theme/bootstrap/templates/view/index.tpl
htdocs/theme/bootstrap/templates/view/index.tpl
+8
-8
htdocs/theme/default/templates/header.tpl
htdocs/theme/default/templates/header.tpl
+0
-45
htdocs/theme/default/templates/microheader.tpl
htdocs/theme/default/templates/microheader.tpl
+0
-26
htdocs/view/groupviews.php
htdocs/view/groupviews.php
+2
-0
htdocs/view/view.php
htdocs/view/view.php
+0
-2
htdocs/webservice/admin/index.php
htdocs/webservice/admin/index.php
+46
-30
htdocs/webservice/admin/oauthv1sregister.php
htdocs/webservice/admin/oauthv1sregister.php
+7
-5
htdocs/webservice/admin/serviceconfig.php
htdocs/webservice/admin/serviceconfig.php
+2
-2
htdocs/webservice/admin/tokenconfig.php
htdocs/webservice/admin/tokenconfig.php
+2
-3
htdocs/webservice/admin/userconfig.php
htdocs/webservice/admin/userconfig.php
+2
-4
htdocs/webservice/admin/webservicelogs.php
htdocs/webservice/admin/webservicelogs.php
+2
-0
htdocs/webservice/apptokens.php
htdocs/webservice/apptokens.php
+11
-7
htdocs/webservice/testclient.php
htdocs/webservice/testclient.php
+2
-0
No files found.
htdocs/account/activity/index.json.php
View file @
629a64e6
...
...
@@ -22,8 +22,7 @@ if ($readone) {
set_field
(
'notification_internal_activity'
,
'read'
,
1
,
'id'
,
$readone
,
'usr'
,
$USER
->
get
(
'id'
));
$unread
=
$USER
->
add_unread
(
-
1
);
$data
=
array
(
'newunreadcount'
=>
$unread
,
'newimage'
=>
$THEME
->
get_image_url
(
$unread
?
'newmail'
:
'message'
),
'newunreadcount'
=>
$unread
);
json_reply
(
false
,
array
(
'data'
=>
$data
));
}
...
...
@@ -98,7 +97,6 @@ $newhtml = activitylist_html($type, $limit, $offset);
if
(
isset
(
$newunread
))
{
$newhtml
[
'newunreadcount'
]
=
$newunread
;
$newhtml
[
'newimage'
]
=
$THEME
->
get_image_url
(
$newunread
?
'newmail'
:
'message'
);
}
json_reply
(
false
,
(
object
)
array
(
'message'
=>
$message
,
'data'
=>
$newhtml
));
htdocs/admin/extensions/plugins.php
View file @
629a64e6
...
...
@@ -137,9 +137,10 @@ foreach (array_keys($plugins) as $plugin) {
}
global
$THEME
;
$loadingicon
=
$THEME
->
get_image_url
(
'loading'
);
$successicon
=
$THEME
->
get_image_url
(
'success'
);
$failureicon
=
$THEME
->
get_image_url
(
'failure'
);
$loadingicon
=
'fa fa-spinner fa-pulse'
;
$successicon
=
'fa fa-check text-success'
;
$failureicon
=
'fa fa-exclaimation-triangle'
;
$loadingstring
=
json_encode
(
get_string
(
'upgradeloading'
,
'admin'
));
$successstring
=
json_encode
(
get_string
(
'upgradesuccesstoversion'
,
'admin'
));
...
...
@@ -148,12 +149,12 @@ $failurestring = json_encode(get_string('upgradefailure', 'admin'));
$javascript
=
<<<JAVASCRIPT
function installplugin(name) {
$(name + '.message').innerHTML = '<
img src="{$loadingicon}" alt=' + {$loadingstring} + '" /
>';
$(name + '.message').innerHTML = '<
span class="{$loadingicon}" title=' + {$loadingstring} + '"></span
>';
sendjsonrequest('../upgrade.json.php', { 'name': name }, 'GET', function (data) {
if (!data.error) {
var message = {$successstring} + data.newversion;
$(name + '.message').innerHTML = '<
img src="{$successicon}" alt=":)" />
' + message;
$(name + '.message').innerHTML = '<
span class="{$successicon}" title=":)"></span>
' + message;
$(name + '.install').innerHTML = '';
// move the whole thing into the list of installed plugins
// new parent node
...
...
@@ -174,7 +175,7 @@ function installplugin(name) {
else {
message = {$failurestring};
}
$(name).innerHTML = '<
img src="{$failureicon}" alt=":(" />
' + message;
$(name).innerHTML = '<
span class="{$failureicon}" title=":("></span>
' + message;
}
},
function () {
...
...
htdocs/admin/upgrade.php
View file @
629a64e6
...
...
@@ -85,10 +85,11 @@ if (empty($upgrades['core']->install)) {
}
}
$loadingicon
=
$THEME
->
get_image_url
(
'loading'
);
$successicon
=
$THEME
->
get_image_url
(
'success'
);
$failureicon
=
$THEME
->
get_image_url
(
'failure'
);
$warningicon
=
$THEME
->
get_image_url
(
'warning'
);
$loadingicon
=
'fa fa-spinner fa-pulse'
;
$successicon
=
'fa fa-check text-success'
;
$failureicon
=
'fa fa-minus-circle text-danger'
;
$warningicon
=
'fa fa-exclaimation-triangle'
;
// Remove all files in the smarty and dwoo caches
// TODO post 1.2 remove the smarty part
...
...
@@ -145,18 +146,18 @@ $js = <<< EOJS
return
;
// done
}
$
(
element
)
.
innerHTML
=
'<
img src="{$loadingicon}" alt="'
+
{
$loadingstring
}
+
'" /
>'
;
$
(
element
)
.
innerHTML
=
'<
span class="{$loadingicon}" title="'
+
{
$loadingstring
}
+
'"></span
>'
;
sendjsonrequest
(
'upgrade.json.php'
,
{
'name'
:
element
,
'last'
:
todo
.
length
==
0
},
'GET'
,
function
(
data
)
{
if
(
!
data
.
error
)
{
var
message
;
if
(
data
.
coredata
)
{
message
=
{
$coresuccess
};
$
(
data
.
key
)
.
innerHTML
=
'<
img src="{$successicon}" alt=":)" />
'
+
message
;
$
(
data
.
key
)
.
innerHTML
=
'<
span class="{$successicon}" title=":)"></span>
'
+
message
;
}
else
if
(
data
.
localdata
)
{
message
=
{
$localsuccess
};
$
(
data
.
key
)
.
innerHTML
=
'<
img src="{$successicon}" alt=":)" />
'
+
message
;
$
(
data
.
key
)
.
innerHTML
=
'<
span class="{$successicon}" title=":)"></span>
'
+
message
;
}
else
if
(
data
.
install
||
data
.
upgrade
)
{
if
(
data
.
install
)
{
...
...
@@ -171,7 +172,7 @@ $js = <<< EOJS
}
}
message
+=
data
.
newversion
?
data
.
newversion
:
''
;
$
(
data
.
key
)
.
innerHTML
=
'<
img src="{$successicon}" alt=":)" />
'
+
message
;
$
(
data
.
key
)
.
innerHTML
=
'<
span class="{$successicon}" title=":)"></span>
'
+
message
;
}
else
if
(
data
.
done
)
{
message
=
data
.
message
;
...
...
@@ -179,7 +180,7 @@ $js = <<< EOJS
}
else
{
message
=
data
.
message
;
$
(
data
.
key
)
.
innerHTML
=
'<
img src="{$failureicon}" alt=":(" />
'
+
message
;
$
(
data
.
key
)
.
innerHTML
=
'<
span class="{$failureicon}" title=":("></span>
'
+
message
;
}
if
(
data
.
feedback
)
{
var
feedback_element
=
DIV
();
...
...
@@ -196,11 +197,11 @@ $js = <<< EOJS
else
{
message
=
{
$failurestring
};
}
$
(
data
.
key
)
.
innerHTML
=
'<
img src="{$failureicon}" alt=":(" />
'
+
message
;
$
(
data
.
key
)
.
innerHTML
=
'<
span class="{$failureicon}" title=":("></span>
'
+
message
;
}
},
function
()
{
$
(
element
)
.
innerHTML
=
'<
img src="{$failureicon}" alt=":(" />
'
+
{
$failurestring
};
$
(
element
)
.
innerHTML
=
'<
span class="{$failureicon}" title=":(" ></span>
'
+
{
$failurestring
};
},
true
);
}
...
...
htdocs/artefact/annotation/lib.php
View file @
629a64e6
...
...
@@ -235,7 +235,7 @@ class ArtefactTypeAnnotation extends ArtefactType {
public
static
function
get_icon
(
$options
=
null
)
{
global
$THEME
;
return
$THEME
->
get_image_url
(
'annotation'
,
'artefact/annotation'
)
;
return
false
;
}
public
static
function
get_links
(
$id
)
{
...
...
@@ -482,7 +482,7 @@ class ArtefactTypeAnnotationfeedback extends ArtefactType {
public
static
function
get_icon
(
$options
=
null
)
{
global
$THEME
;
return
$THEME
->
get_image_url
(
'annotation'
,
'artefact/annotation'
)
;
return
false
;
}
public
function
delete
()
{
...
...
@@ -1186,9 +1186,10 @@ class ArtefactTypeAnnotationfeedback extends ArtefactType {
'artefactid'
=>
array
(
'type'
=>
'hidden'
,
'value'
=>
$artefactid
),
'blockid'
=>
array
(
'type'
=>
'hidden'
,
'value'
=>
$blockid
),
'submit'
=>
array
(
'type'
=>
'
image
'
,
'
src'
=>
$THEME
->
get_image_url
(
'btn_deleteremove'
)
,
'type'
=>
'
button
'
,
'
usebuttontag'
=>
true
,
'value'
=>
get_string
(
'delete'
),
'class'
=>
'btn btn-default'
,
'elementtitle'
=>
get_string
(
'delete'
),
'confirm'
=>
get_string
(
'reallydeletethisannotationfeedback'
,
'artefact.annotation'
),
'name'
=>
'delete_annotation_feedback_submit'
,
...
...
htdocs/artefact/blog/lib.php
View file @
629a64e6
...
...
@@ -263,7 +263,7 @@ class ArtefactTypeBlog extends ArtefactType {
public
static
function
get_icon
(
$options
=
null
)
{
global
$THEME
;
return
$THEME
->
get_image_url
(
'journal'
)
;
return
false
;
}
public
static
function
is_singular
()
{
...
...
@@ -707,7 +707,7 @@ class ArtefactTypeBlogPost extends ArtefactType {
public
static
function
get_icon
(
$options
=
null
)
{
global
$THEME
;
return
$THEME
->
get_image_url
(
'journal_entry'
)
;
return
false
;
}
public
static
function
is_singular
()
{
...
...
htdocs/artefact/comment/lib.php
View file @
629a64e6
...
...
@@ -261,7 +261,7 @@ class ArtefactTypeComment extends ArtefactType {
public
static
function
get_icon
(
$options
=
null
)
{
global
$THEME
;
return
$THEME
->
get_image_url
(
'comment'
,
'artefact/comment'
)
;
return
false
;
}
public
function
delete
()
{
...
...
htdocs/artefact/file/groupfiles.php
View file @
629a64e6
...
...
@@ -48,6 +48,7 @@ $smarty = smarty(
)
);
$smarty
->
assign
(
'heading'
,
$group
->
name
);
$smarty
->
assign
(
'subsectionheading'
,
get_string
(
'Files'
,
'artefact.file'
));
$smarty
->
assign
(
'headingclass'
,
'page-header'
);
$smarty
->
assign
(
'form'
,
$form
);
$smarty
->
assign
(
'INLINEJAVASCRIPT'
,
$js
);
...
...
htdocs/artefact/internal/lib.php
View file @
629a64e6
...
...
@@ -851,7 +851,7 @@ class ArtefactTypeHtml extends ArtefactType {
public
static
function
get_icon
(
$options
=
null
)
{
global
$THEME
;
return
$THEME
->
get_image_url
(
'note'
,
'artefact/internal'
)
;
return
false
;
}
public
static
function
is_singular
()
{
...
...
htdocs/artefact/multirecipientnotification/indexin.json.php
View file @
629a64e6
...
...
@@ -137,7 +137,6 @@ $newhtml = activitylistin_html($type, $limit, $offset);
if
(
isset
(
$newunread
))
{
$newhtml
[
'newunreadcount'
]
=
$newunread
;
$newhtml
[
'newimage'
]
=
$THEME
->
get_image_url
(
$newunread
?
'newmail'
:
'message'
);
}
json_reply
(
false
,
(
object
)
array
(
'message'
=>
$message
,
'data'
=>
$newhtml
));
htdocs/artefact/multirecipientnotification/indexout.json.php
View file @
629a64e6
...
...
@@ -27,7 +27,6 @@ if ($readone) {
$unread
=
$USER
->
add_unread
(
-
1
);
$data
=
array
(
'newunreadcount'
=>
$unread
,
'newimage'
=>
$THEME
->
get_image_url
(
$unread
?
'newmail'
:
'message'
),
);
json_reply
(
false
,
array
(
'data'
=>
$data
));
}
...
...
@@ -90,7 +89,6 @@ $newhtml = activitylistout_html($type, $limit, $offset);
if
(
isset
(
$newunread
))
{
$newhtml
[
'newunreadcount'
]
=
$newunread
;
$newhtml
[
'newimage'
]
=
$THEME
->
get_image_url
(
$newunread
?
'newmail'
:
'message'
);
}
json_reply
(
false
,
(
object
)
array
(
'message'
=>
$message
,
'data'
=>
$newhtml
));
htdocs/artefact/plans/lib.php
View file @
629a64e6
...
...
@@ -81,7 +81,7 @@ class ArtefactTypePlan extends ArtefactType {
public
static
function
get_icon
(
$options
=
null
)
{
global
$THEME
;
return
$THEME
->
get_image_url
(
'plan'
,
'artefact/plans'
)
;
return
false
;
}
public
static
function
is_singular
()
{
...
...
@@ -355,7 +355,7 @@ class ArtefactTypeTask extends ArtefactType {
public
static
function
get_icon
(
$options
=
null
)
{
global
$THEME
;
return
$THEME
->
get_image_url
(
'plantask'
,
'artefact/plans'
)
;
return
false
;
}
public
static
function
is_singular
()
{
...
...
htdocs/artefact/resume/lib.php
View file @
629a64e6
...
...
@@ -68,7 +68,7 @@ class PluginArtefactResume extends PluginArtefact {
'workskill'
=>
array
(
'text'
),
);
}
public
static
function
submenu_items
()
{
$tabs
=
array
(
'index'
=>
array
(
...
...
@@ -1053,8 +1053,8 @@ EOF;
$editjsstr
=
json_encode
(
get_string
(
'editspecific'
,
'mahara'
,
'%s'
))
.
".replace('%s',
{
$titlestring
}
)"
;
$deljsstr
=
json_encode
(
get_string
(
'deletespecific'
,
'mahara'
,
'%s'
))
.
".replace('%s',
{
$titlestring
}
)"
;
$imagemoveblockup
=
json_encode
(
$THEME
->
get_image_url
(
'btn_moveup'
))
;
$imagemoveblockdown
=
json_encode
(
$THEME
->
get_image_url
(
'btn_movedown'
))
;
$imagemoveblockup
=
false
;
$imagemoveblockdown
=
false
;
$upstr
=
get_string
(
'moveup'
,
'artefact.resume'
);
$downstr
=
get_string
(
'movedown'
,
'artefact.resume'
);
...
...
@@ -1072,7 +1072,7 @@ EOF;
function (r, d) {
var buttons = [];
if (r._rownumber > 1) {
var up =
var up =
A({'href': '', 'class': 'moveup'},
SPAN({'class': 'fa fa-long-arrow-up'}),
SPAN({'class': 'sr-only'}, '{$upstr}'));
...
...
@@ -1083,10 +1083,10 @@ EOF;
buttons.push(up);
}
if (!r._last) {
var down =
var down =
A({'href': '', 'class':'movedown'},
SPAN({'class': 'fa fa-long-arrow-down'}),
SPAN({'class': 'sr-only'}, '{$downstr}'));
SPAN({'class': 'sr-only'}, '{$downstr}'));
connect(down, 'onclick', function (e) {
e.stop();
return moveComposite(d.type, r.id, r.artefact, 'down');
...
...
@@ -1102,14 +1102,14 @@ EOF;
$js
.
=
<<<EOF
function (r, d) {
var editlink =
var editlink =
A({'href': 'editcomposite.php?id=' + r.id + '&artefact=' + r.artefact, 'title': {$editstr}, 'class': 'btn btn-default btn-xs'},
SPAN({'class': 'fa fa-pencil'}),
SPAN({'class': 'sr-only'}, {$editstr}));
var dellink =
var dellink =
A({'href': '', 'title': {$delstr}, 'class': 'btn btn-default btn-xs'},
SPAN({'class': 'fa fa-trash text-danger'}),
SPAN({'class': 'sr-only'}, {$deljsstr}));
SPAN({'class': 'sr-only'}, {$deljsstr}));
connect(dellink, 'onclick', function (e) {
e.stop();
return deleteComposite(d.type, r.id, r.artefact);
...
...
htdocs/auth/webservice/lib.php
View file @
629a64e6
...
...
@@ -92,20 +92,15 @@ class PluginAuthWebservice extends PluginAuth {
if
(
!
is_plugin_active
(
'webservice'
))
{
return
array
();
}
return
array
(
$map
=
array
(
'configextensions/webservices'
=>
array
(
'path'
=>
'configextensions/webservices'
,
'url'
=>
'webservice/admin/index.php'
,
'title'
=>
get_string
(
'webservice'
,
'auth.webservice'
),
'weight'
=>
50
,
),
'configextensions/webservices/webservice'
=>
array
(
'path'
=>
'configextensions/webservices/webservice'
,
'parent'
=>
'configextensions/webservices'
,
'url'
=>
'webservice/admin/index.php'
,
'title'
=>
get_string
(
'webservicesconfig'
,
'auth.webservice'
),
'weight'
=>
5
,
),
'configextensions/webservices/oauthconfig'
=>
array
(
'path'
=>
'configextensions/webservices/oauthconfig'
,
'url'
=>
'webservice/admin/oauthv1sregister.php'
,
...
...
@@ -131,6 +126,14 @@ class PluginAuthWebservice extends PluginAuth {
'weight'
=>
40
,
),
);
if
(
defined
(
'MENUITEM'
)
&&
isset
(
$map
[
MENUITEM
]))
{
$map
[
MENUITEM
][
'selected'
]
=
true
;
}
return
$map
;
}
/*
...
...
htdocs/collection/index.php
View file @
629a64e6
...
...
@@ -28,6 +28,8 @@ $institutionname = param_alphanum('institution', false);
$urlparams
=
array
();
$pageIcon
=
'fa fa-bookmark'
;
$subsectionheading
=
false
;
if
(
!
empty
(
$groupid
))
{
define
(
'MENUITEM'
,
'groups/collections'
);
define
(
'GROUP'
,
$groupid
);
...
...
@@ -39,9 +41,12 @@ if (!empty($groupid)) {
throw
new
GroupAccessDeniedException
(
get_string
(
'cantlistgroupcollections'
,
'collection'
));
}
define
(
'SUBTITLE'
,
get_string
(
'groupcollections'
,
'collection'
)
);
define
(
'SUBTITLE'
,
false
);
define
(
'TITLE'
,
$group
->
name
);
$urlparams
[
'group'
]
=
$groupid
;
$subsectionheading
=
get_string
(
'Collections'
,
'collection'
);
$pageIcon
=
''
;
}
else
if
(
!
empty
(
$institutionname
))
{
if
(
$institutionname
==
'mahara'
)
{
...
...
@@ -129,6 +134,14 @@ if (!empty($institutionname) && ($institutionname != 'mahara')) {
$smarty
->
assign
(
'institutionselector'
,
$s
[
'institutionselector'
]);
$smarty
->
assign
(
'INLINEJAVASCRIPT'
,
$s
[
'institutionselectorjs'
]);
}
if
(
$subsectionheading
){
$smarty
->
assign
(
'subsectionheading'
,
$subsectionheading
);
}
if
(
SUBTITLE
)
{
$smarty
->
assign
(
'PAGESUBHEADING'
,
SUBTITLE
);
}
$smarty
->
assign
(
'canedit'
,
$canedit
);
$smarty
->
assign
(
'urlparamsstr'
,
$urlparamsstr
);
$smarty
->
assign
(
'collections'
,
$data
->
data
);
...
...
@@ -136,6 +149,6 @@ $smarty->assign('pagination', $pagination['html']);
$smarty
->
assign
(
'headingclass'
,
'page-header'
);
$smarty
->
assign
(
'PAGEHEADING'
,
TITLE
);
$smarty
->
assign
(
'PAGEICON'
,
$pageIcon
);
$smarty
->
assign
(
'PAGESUBHEADING'
,
SUBTITLE
);
$smarty
->
assign
(
'SUBPAGETOP'
,
'collection/actions.tpl'
);
$smarty
->
display
(
'collection/index.tpl'
);
htdocs/collection/views.php
View file @
629a64e6
...
...
@@ -286,6 +286,7 @@ EOF;
$smarty
=
smarty
(
array
(
'jquery'
,
'js/jquery/jquery-ui/js/jquery-ui-1.10.2.min.js'
,
'js/jquery/jquery-ui/js/jquery-ui.touch-punch.min.js'
));
if
(
!
empty
(
$groupid
))
{
$smarty
->
assign
(
'PAGESUBHEADING'
,
SUBTITLE
);
$smarty
->
assign
(
'PAGEHELPNAME'
,
'0'
);
$smarty
->
assign
(
'SUBPAGEHELPNAME'
,
'1'
);
...
...
@@ -293,6 +294,7 @@ if (!empty($groupid)) {
else
{
$smarty
->
assign
(
'PAGEHEADING'
,
SUBTITLE
);
}
$smarty
->
assign
(
'PAGEICON'
,
'fa fa-folder-open'
);
$smarty
->
assign
(
'INLINEJAVASCRIPT'
,
$inlinejs
);
$smarty
->
assign
(
'baseurl'
,
$baseurl
);
...
...
htdocs/group/members.php
View file @
629a64e6
...
...
@@ -176,6 +176,7 @@ if ($role == 'admin') {
}
$smarty
->
assign
(
'headingclass'
,
'page-header'
);
$smarty
->
assign
(
'subsectionheading'
,
get_string
(
'members'
));
$smarty
->
assign
(
'INLINEJAVASCRIPT'
,
$js
);
$smarty
->
assign
(
'heading'
,
$group
->
name
);
$smarty
->
assign
(
'form'
,
$searchform
);
...
...
htdocs/group/shareviews.php
View file @
629a64e6
...
...
@@ -26,6 +26,7 @@ $accesslists = View::get_accesslists(null, $group->id);
$smarty
=
smarty
();
$smarty
->
assign
(
'heading'
,
$group
->
name
);
$smarty
->
assign
(
'subsectionheading'
,
TITLE
);
$smarty
->
assign
(
'headingclass'
,
'page-header'
);
$smarty
->
assign
(
'accesslists'
,
$accesslists
);
$smarty
->
display
(
'view/share.tpl'
);
htdocs/group/view.php
View file @
629a64e6
...
...
@@ -86,6 +86,8 @@ $smarty = smarty(
array
(),
array
(
'stylesheets'
=>
array
(
'style/views.css'
))
);
$smarty
->
assign
(
'INLINEJAVASCRIPT'
,
$inlinejs
);
$smarty
->
assign
(
'viewid'
,
$view
->
get
(
'id'
));
$smarty
->
assign
(
'viewcontent'
,
$viewcontent
);
...
...
@@ -94,4 +96,5 @@ $smarty->assign('editwindow', $editwindow);
$smarty
->
assign
(
'returnto'
,
'view'
);
$smarty
->
assign
(
'SUBPAGETOP'
,
'group/groupuserstatus.tpl'
);
$smarty
->
assign
(
'headingclass'
,
'page-header'
);
$smarty
->
assign
(
'subsectionheading'
,
get_string
(
'about'
));
$smarty
->
display
(
'group/view.tpl'
);
htdocs/interaction/forum/index.php
View file @
629a64e6
...
...
@@ -108,6 +108,8 @@ $smarty->assign('publicgroup', $group->public);
$smarty
->
assign
(
'feedlink'
,
$feedlink
);
$smarty
->
assign
(
'heading'
,
$group
->
name
);
$smarty
->
assign
(
'headingclass'
,
'page-header'
);
$smarty
->
assign
(
'subsectionheading'
,
get_string
(
'nameplural'
,
'interaction.forum'
));
$smarty
->
assign
(
'rsswithtitle'
,
true
);
$smarty
->
assign
(
'admin'
,
$membership
==
'admin'
);
$smarty
->
assign
(
'groupadmins'
,
group_get_admins
(
array
(
$groupid
)));
$smarty
->
assign
(
'forums'
,
$forums
);
...
...
htdocs/interaction/forum/topic.php
View file @
629a64e6
...
...
@@ -68,15 +68,17 @@ $groupadmins = group_get_admin_ids($topic->groupid);
if
(
$membership
&&
!
$topic
->
forumsubscribed
)
{
$topic
->
subscribe
=
pieform
(
array
(
'name'
=>
'subscribe_topic'
,
'renderer'
=>
'
oneline
'
,
'renderer'
=>
'
div
'
,
'plugintype'
=>
'interaction'
,
'pluginname'
=>
'forum'
,
'class'
=>
'form-as-button pull-left'
,
'autofocus'
=>
false
,
'elements'
=>
array
(
'submit'
=>
array
(
'type'
=>
'submit'
,
'class'
=>
$topic
->
topicsubscribed
?
'btn btn-danger'
:
'btn btn-success'
,
'value'
=>
$topic
->
topicsubscribed
?
get_string
(
'unsubscribefromtopic'
,
'interaction.forum'
)
:
get_string
(
'subscribetotopic'
,
'interaction.forum'
),
'type'
=>
'button'
,
'usebuttontag'
=>
true
,
'class'
=>
'btn btn-default'
,
'value'
=>
$topic
->
topicsubscribed
?
'<span class="fa fa-lg fa-star-o prs text-danger"></span> '
.
get_string
(
'unsubscribefromtopic'
,
'interaction.forum'
)
:
'<span class="fa fa-lg fa-star prs text-primary"></span> '
.
get_string
(
'subscribetotopic'
,
'interaction.forum'
),
'help'
=>
false
),
'topic'
=>
array
(
...
...
htdocs/interaction/forum/view.php
View file @
629a64e6
...
...
@@ -86,8 +86,8 @@ else if ($moderator) {
array
(
$forumid
,
$forum
->
groupid
,
'forum'
,
$userid
)
);
}
$ineditwindow
=
group_within_edit_window
(
$group
);
if
(
!
$ineditwindow
)
{
$moderator
=
false
;
}
...
...
@@ -176,7 +176,7 @@ if ($membership) {
'plugintype'
=>
'interaction'
,
'pluginname'
=>
'forum'
,
'autofocus'
=>
false
,
'class'
=>
'form-as-button'
,
'class'
=>
'form-as-button
pull-left
'
,
'elements'
=>
array
(
'submit'
=>
array
(
'type'
=>
'button'
,
...
...
@@ -295,6 +295,7 @@ if ($publicgroup) {
$smarty
=
smarty
(
array
(),
$headers
,
array
(),
array
());
$smarty
->
assign
(
'heading'
,
$forum
->
groupname
);
$smarty
->
assign
(
'subsectionheading'
,
get_string
(
'nameplural'
,
'interaction.forum'
));
$smarty
->
assign
(
'subheading'
,
$forum
->
title
);
$smarty
->
assign
(
'headingclass'
,
'page-header'
);
$smarty
->
assign
(
'forum'
,
$forum
);
...
...
@@ -309,8 +310,8 @@ $smarty->assign('groupadmins', group_get_admin_ids($forum->groupid));
$smarty
->
assign
(
'stickytopics'
,
$stickytopics
);
$smarty
->
assign
(
'regulartopics'
,
$regulartopics
);
$smarty
->
assign
(
'moderators'
,
$moderators
);
$smarty
->
assign
(
'closedicon'
,
$THEME
->
get_image_url
(
'locked'
)
);
$smarty
->
assign
(
'subscribedicon'
,
$THEME
->
get_image_url
(
'subscribed'
)
);
$smarty
->
assign
(
'closedicon'
,
'fa fa-lock-alt'
);
$smarty
->
assign
(
'subscribedicon'
,
'fa fa-star'
);
$smarty
->
assign
(
'pagination'
,
$pagination
[
'html'
]);
$smarty
->
assign
(
'INLINEJAVASCRIPT'
,
$inlinejavascript
);
$smarty
->
display
(
'interaction:forum:view.tpl'
);
...
...
htdocs/lib/web.php
View file @
629a64e6
...
...
@@ -4405,21 +4405,21 @@ function display_icon($type, $id = false) {
case
'success'
:
case
'true'
:
case
'enabled'
:
$image
=
'success'
;
$image
=
'
fa fa-lg fa-check text-
success'
;
break
;
case
'off'
:
case
'no'
:
case
'fail'
:
case
'false'
:
case
'disabled'
:
$image
=
'fa
il
'
;
$image
=
'fa
fa-lg fa-times text-danger
'
;
break
;
}
$imageurl
=
$THEME
->
get_image_url
(
$image
);
$html
=
'<
img src="'
.
$imageurl
.
'" class="displayicon" alt
="'
.
get_string
(
$type
)
.
'"'
;
$html
=
'<
span class="'
.
$image
.
'" class="displayicon" title
="'
.
get_string
(
$type
)
.
'"'
;
if
(
$id
)
{
$html
.
=
' id="'
.
$id
.
'"'
;
}
$html
.
=
'>'
;
$html
.
=
'>
</span>
'
;
return
$html
;
}
htdocs/theme/bootstrap/artefact/multirecipientnotification/templates/indexout.tpl
View file @
629a64e6
{
include
file
=
"header.tpl"
}
<a
title=
"
{
str
section
=
'artefact.multirecipientnotification'
tag
=
'composemessagedesc'
}
"
class=
"btn
btn-default compose btn-lg
"
href=
"
{
$WWWROOT
}
artefact/multirecipientnotification/sendmessage.php"
>
<a
title=
"
{
str
section
=
'artefact.multirecipientnotification'
tag
=
'composemessagedesc'
}
"
class=
"btn
-with-heading btn-lg btn btn-default
"
href=
"
{
$WWWROOT
}
artefact/multirecipientnotification/sendmessage.php"
>
<span
class=
"fa fa-edit"
></span>
{
str
section
=
'artefact.multirecipientnotification'
tag
=
'composemessage'
}
</a>
...
...
@@ -32,7 +32,7 @@
</a>
</div>
</div>
<form
class=
"form-notificationlist pbl ptl"
name=
"notificationlist"
method=
"post"
>
<div
id=
"activitylist"
class=
"notification-list"
{
if
$paginatorData
}
data-paginator=
'
{
$paginatorData
}
'
{/
if
}
>
{
$activitylist
[
'html'
]|
safe
}
...
...
htdocs/theme/bootstrap/interaction/forum/templates/index.tpl
View file @
629a64e6
...
...
@@ -9,115 +9,114 @@
</div>
{/
if
}
<h2
class=
"pbl mbl"
>
{
str
tag
=
"nameplural"
section
=
interaction
.
forum
}
{
if
$publicgroup
}
<a
href=
"
{
$feedlink
}
"
>
<span
class=
"fa-rss fa"
></span>
</a>
{/
if
}
</h2>
<div
class=
"row"
>
<div
class=
"col-md-12 mtxl"
>
{
if
$forums
}
<div
id=
"view-forum"
class=
"table-responsive"
>
<table
id=
"forums-list"
class=
"table fullwidth table-striped table-padded"
>
<thead>
<tr>
<th>
{
str
tag
=
"name"
section
=
"interaction.forum"
}
</th>
<th
class=
"text-center"
>
{
str
tag
=
"Topics"
section
=
"interaction.forum"
}
</th>
<th
class=
"subscribeth"
>
<span
class=
"accessible-hidden sr-only"
>
{
str
tag
=
Subscribe
section
=
interaction
.
forum
}
</span>
</th>
<th
class=
"control-buttons"
>
<span
class=
"accessible-hidden sr-only"
>
{
str
tag
=
edit
}
</span>
</th>
</tr>
</thead>
<tbody>
{
foreach
from
=
$forums
item
=
forum
}
<tr
class=
"
{
cycle
values
=
'r0,r1'
}
"
>
<td>
<h3
class=
"title"
>
<a
href=
"
{
$WWWROOT
}
interaction/forum/view.php?id=
{
$forum
->
id
}
"
>
{
$forum
->
title
}
</a>
{
if
$forums
}
<div
id=
"view-forum"
class=
"table-responsive"
>
<table
id=
"forums-list"
class=
"table fullwidth nohead"
>
<tr>
<th>
{
str
tag
=
"name"
section
=
"interaction.forum"
}