Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
mahara
mahara
Commits
f163fa6c
Commit
f163fa6c
authored
May 28, 2015
by
Pat Kira
Committed by
Aaron Wells
Jun 15, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Comments on page view (bootstrap)
Bug 1465107: Use Bootstrap CSS Framework Change-Id: I2fbc8593a97edf9721edb40fe2ecc0561c98c15b
parent
91927381
Changes
58
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
58 changed files
with
434 additions
and
165 deletions
+434
-165
htdocs/artefact/plans/delete/index.php
htdocs/artefact/plans/delete/index.php
+1
-1
htdocs/artefact/plans/delete/task.php
htdocs/artefact/plans/delete/task.php
+1
-1
htdocs/collection/delete.php
htdocs/collection/delete.php
+1
-0
htdocs/group/delete.php
htdocs/group/delete.php
+1
-0
htdocs/group/find.php
htdocs/group/find.php
+1
-1
htdocs/group/members.php
htdocs/group/members.php
+1
-1
htdocs/group/mygroups.php
htdocs/group/mygroups.php
+1
-1
htdocs/interaction/delete.php
htdocs/interaction/delete.php
+1
-0
htdocs/interaction/forum/deletepost.php
htdocs/interaction/forum/deletepost.php
+1
-0
htdocs/interaction/forum/deletetopic.php
htdocs/interaction/forum/deletetopic.php
+2
-0
htdocs/interaction/forum/index.php
htdocs/interaction/forum/index.php
+5
-4
htdocs/interaction/forum/lib.php
htdocs/interaction/forum/lib.php
+1
-0
htdocs/interaction/forum/topic.php
htdocs/interaction/forum/topic.php
+3
-3
htdocs/interaction/forum/view.php
htdocs/interaction/forum/view.php
+1
-1
htdocs/js/viewmenu.js
htdocs/js/viewmenu.js
+2
-2
htdocs/lang/en.utf8/view.php
htdocs/lang/en.utf8/view.php
+2
-2
htdocs/lib/group.php
htdocs/lib/group.php
+22
-15
htdocs/lib/license.php
htdocs/lib/license.php
+1
-1
htdocs/lib/objectionable.php
htdocs/lib/objectionable.php
+4
-0
htdocs/lib/view.php
htdocs/lib/view.php
+22
-10
htdocs/lib/web.php
htdocs/lib/web.php
+1
-1
htdocs/skin/delete.php
htdocs/skin/delete.php
+1
-1
htdocs/skin/index.php
htdocs/skin/index.php
+1
-1
htdocs/theme/bootstrap/artefact/blog/templates/render/blogpost_renderfull.tpl
...ap/artefact/blog/templates/render/blogpost_renderfull.tpl
+13
-5
htdocs/theme/bootstrap/artefact/blog/templates/viewposts.tpl
htdocs/theme/bootstrap/artefact/blog/templates/viewposts.tpl
+12
-10
htdocs/theme/bootstrap/artefact/file/blocktype/image/templates/image.tpl
...otstrap/artefact/file/blocktype/image/templates/image.tpl
+4
-5
htdocs/theme/bootstrap/artefact/plans/templates/delete.tpl
htdocs/theme/bootstrap/artefact/plans/templates/delete.tpl
+1
-1
htdocs/theme/bootstrap/blocktype/groupviews/templates/groupviews.tpl
...e/bootstrap/blocktype/groupviews/templates/groupviews.tpl
+1
-1
htdocs/theme/bootstrap/interaction/forum/templates/deletetopic.tpl
...eme/bootstrap/interaction/forum/templates/deletetopic.tpl
+4
-1
htdocs/theme/bootstrap/interaction/forum/templates/topics.tpl
...cs/theme/bootstrap/interaction/forum/templates/topics.tpl
+12
-6
htdocs/theme/bootstrap/interaction/forum/templates/view.tpl
htdocs/theme/bootstrap/interaction/forum/templates/view.tpl
+101
-1
htdocs/theme/bootstrap/static/images/license/by-nc-nd.png
htdocs/theme/bootstrap/static/images/license/by-nc-nd.png
+0
-0
htdocs/theme/bootstrap/static/images/license/by-nc-sa.png
htdocs/theme/bootstrap/static/images/license/by-nc-sa.png
+0
-0
htdocs/theme/bootstrap/static/images/license/by-nc.png
htdocs/theme/bootstrap/static/images/license/by-nc.png
+0
-0
htdocs/theme/bootstrap/static/images/license/by-nd.png
htdocs/theme/bootstrap/static/images/license/by-nd.png
+0
-0
htdocs/theme/bootstrap/static/images/license/by-sa.png
htdocs/theme/bootstrap/static/images/license/by-sa.png
+0
-0
htdocs/theme/bootstrap/static/images/license/by.png
htdocs/theme/bootstrap/static/images/license/by.png
+0
-0
htdocs/theme/bootstrap/static/images/license/gfdl.png
htdocs/theme/bootstrap/static/images/license/gfdl.png
+0
-0
htdocs/theme/bootstrap/static/sass/form/_form.scss
htdocs/theme/bootstrap/static/sass/form/_form.scss
+6
-0
htdocs/theme/bootstrap/static/sass/layout/_layout.scss
htdocs/theme/bootstrap/static/sass/layout/_layout.scss
+4
-0
htdocs/theme/bootstrap/static/sass/typography/_text.scss
htdocs/theme/bootstrap/static/sass/typography/_text.scss
+5
-1
htdocs/theme/bootstrap/static/sass/utilities/_mixins.scss
htdocs/theme/bootstrap/static/sass/utilities/_mixins.scss
+2
-2
htdocs/theme/bootstrap/static/style/style.css
htdocs/theme/bootstrap/static/style/style.css
+4
-0
htdocs/theme/bootstrap/static/style/tinymce.css
htdocs/theme/bootstrap/static/style/tinymce.css
+4
-0
htdocs/theme/bootstrap/templates/account/index.tpl
htdocs/theme/bootstrap/templates/account/index.tpl
+1
-1
htdocs/theme/bootstrap/templates/artefact/artefactcommentsview.tpl
...eme/bootstrap/templates/artefact/artefactcommentsview.tpl
+19
-9
htdocs/theme/bootstrap/templates/collection/delete.tpl
htdocs/theme/bootstrap/templates/collection/delete.tpl
+2
-2
htdocs/theme/bootstrap/templates/group/delete.tpl
htdocs/theme/bootstrap/templates/group/delete.tpl
+1
-1
htdocs/theme/bootstrap/templates/group/groupuserstatus.tpl
htdocs/theme/bootstrap/templates/group/groupuserstatus.tpl
+2
-0
htdocs/theme/bootstrap/templates/skin/delete.tpl
htdocs/theme/bootstrap/templates/skin/delete.tpl
+1
-1
htdocs/theme/bootstrap/templates/view/submit.tpl
htdocs/theme/bootstrap/templates/view/submit.tpl
+1
-1
htdocs/theme/bootstrap/templates/view/view.tpl
htdocs/theme/bootstrap/templates/view/view.tpl
+98
-56
htdocs/theme/bootstrap/templates/view/viewmenu.tpl
htdocs/theme/bootstrap/templates/view/viewmenu.tpl
+50
-8
htdocs/theme/bootstrap/templates/view/viewmenuartefact.tpl
htdocs/theme/bootstrap/templates/view/viewmenuartefact.tpl
+2
-2
htdocs/user/myfriends.php
htdocs/user/myfriends.php
+1
-1
htdocs/view/delete.php
htdocs/view/delete.php
+1
-1
htdocs/view/sharedviews.php
htdocs/view/sharedviews.php
+3
-3
htdocs/view/view.php
htdocs/view/view.php
+2
-0
No files found.
htdocs/artefact/plans/delete/index.php
View file @
f163fa6c
...
...
@@ -33,7 +33,7 @@ $deleteform = array(
'elements'
=>
array
(
'submit'
=>
array
(
'type'
=>
'submitcancel'
,
'class'
=>
'btn btn-d
anger
'
,
'class'
=>
'btn btn-d
efault
'
,
'value'
=>
array
(
get_string
(
'deleteplan'
,
'artefact.plans'
),
get_string
(
'cancel'
)),
'goto'
=>
get_config
(
'wwwroot'
)
.
'/artefact/plans/index.php'
,
),
...
...
htdocs/artefact/plans/delete/task.php
View file @
f163fa6c
...
...
@@ -33,7 +33,7 @@ $deleteform = array(
'elements'
=>
array
(
'submit'
=>
array
(
'type'
=>
'submitcancel'
,
'class'
=>
'btn btn-d
anger
'
,
'class'
=>
'btn btn-d
efault
'
,
'value'
=>
array
(
get_string
(
'deletetask'
,
'artefact.plans'
),
get_string
(
'cancel'
)),
'goto'
=>
get_config
(
'wwwroot'
)
.
'/artefact/plans/plan.php?id='
.
$todelete
->
get
(
'parent'
),
),
...
...
htdocs/collection/delete.php
View file @
f163fa6c
...
...
@@ -64,6 +64,7 @@ $form = pieform(array(
'elements'
=>
array
(
'submit'
=>
array
(
'type'
=>
'submitcancel'
,
'class'
=>
'btn btn-default'
,
'value'
=>
array
(
get_string
(
'yes'
),
get_string
(
'no'
)),
'goto'
=>
$baseurl
,
),
...
...
htdocs/group/delete.php
View file @
f163fa6c
...
...
@@ -37,6 +37,7 @@ $form = pieform(array(
'elements'
=>
array
(
'submit'
=>
array
(
'type'
=>
'submitcancel'
,
'class'
=>
'btn btn-default'
,
'value'
=>
array
(
get_string
(
'yes'
),
get_string
(
'no'
)),
'goto'
=>
group_homepage_url
(
$group
),
)
...
...
htdocs/group/find.php
View file @
f163fa6c
...
...
@@ -74,7 +74,7 @@ $searchform = pieform(array(
'name'
=>
'search'
,
'checkdirtychange'
=>
false
,
'method'
=>
'post'
,
'class'
=>
'form-inline'
,
'class'
=>
'form-inline
ptl pbl
'
,
'elements'
=>
$elements
)
);
...
...
htdocs/group/members.php
View file @
f163fa6c
...
...
@@ -96,7 +96,7 @@ if ('admin' == $role) {
$searchform
=
pieform
(
array
(
'name'
=>
'search'
,
'checkdirtychange'
=>
false
,
'class'
=>
'search-views-form form-inline'
,
'class'
=>
'search-views-form form-inline
ptl pbl
'
,
'elements'
=>
array
(
'id'
=>
array
(
'type'
=>
'hidden'
,
...
...
htdocs/group/mygroups.php
View file @
f163fa6c
...
...
@@ -64,7 +64,7 @@ $form = pieform(array(
'checkdirtychange'
=>
false
,
'method'
=>
'post'
,
'renderer'
=>
'div'
,
'class'
=>
'form-inline'
,
'class'
=>
'form-inline
ptl pbl
'
,
'elements'
=>
array
(
'inputgroup'
=>
array
(
'type'
=>
'fieldset'
,
...
...
htdocs/interaction/delete.php
View file @
f163fa6c
...
...
@@ -44,6 +44,7 @@ $form = pieform(array(
),
'submit'
=>
array
(
'type'
=>
'submitcancel'
,
'class'
=>
'btn btn-success'
,
'value'
=>
array
(
get_string
(
'yes'
),
get_string
(
'no'
)),
'goto'
=>
get_config
(
'wwwroot'
)
.
'interaction/'
.
$instance
->
get
(
'plugin'
)
.
(
$returnto
==
'index'
?
'/index.php?group='
.
$instance
->
get
(
'group'
)
:
'/view.php?id='
.
$instance
->
get
(
'id'
)),
...
...
htdocs/interaction/forum/deletepost.php
View file @
f163fa6c
...
...
@@ -73,6 +73,7 @@ $form = pieform(array(
),
'submit'
=>
array
(
'type'
=>
'submitcancel'
,
'class'
=>
'btn btn-success'
,
'value'
=>
array
(
get_string
(
'yes'
),
get_string
(
'no'
)),
'goto'
=>
get_config
(
'wwwroot'
)
.
'interaction/forum/topic.php?id='
.
$post
->
topic
.
'&post='
.
$postid
),
...
...
htdocs/interaction/forum/deletetopic.php
View file @
f163fa6c
...
...
@@ -69,10 +69,12 @@ $form = pieform(array(
'autofocus'
=>
false
,
'elements'
=>
array
(
'title'
=>
array
(
'type'
=>
'html'
,
'value'
=>
get_string
(
'deletetopicsure'
,
'interaction.forum'
),
),
'submit'
=>
array
(
'type'
=>
'submitcancel'
,
'class'
=>
'btn btn-default'
,
'value'
=>
array
(
get_string
(
'yes'
),
get_string
(
'no'
)),
'goto'
=>
get_config
(
'wwwroot'
)
.
(
$returnto
==
'view'
?
'interaction/forum/view.php?id='
.
$topic
->
forumid
:
'interaction/forum/topic.php?id='
.
$topicid
),
),
...
...
htdocs/interaction/forum/index.php
View file @
f163fa6c
...
...
@@ -67,11 +67,12 @@ if ($forums) {
'renderer'
=>
'oneline'
,
'elements'
=>
array
(
'submit'
=>
array
(
'type'
=>
'submit'
,
'class'
=>
$forum
->
subscribed
?
'btn btn-default btn-xs'
:
'btn btn-primary btn-xs'
,
'value'
=>
$forum
->
subscribed
?
get_string
(
'Unsubscribe'
,
'interaction.forum'
)
:
get_string
(
'Subscribe'
,
'interaction.forum'
),
'type'
=>
'button'
,
'usebuttontag'
=>
true
,
'class'
=>
'btn btn-default btn-xs'
,
'value'
=>
$forum
->
subscribed
?
'<span class="fa fa-lg fa-times prs text-danger"></span> '
.
get_string
(
'Unsubscribe'
,
'interaction.forum'
)
:
'<span class="fa fa-lg fa-star prs text-primary"></span> '
.
get_string
(
'Subscribe'
,
'interaction.forum'
),
// 'help' => $i == 0 ? true : false
'help'
=>
false
'help'
=>
false
),
'forum'
=>
array
(
'type'
=>
'hidden'
,
...
...
htdocs/interaction/forum/lib.php
View file @
f163fa6c
...
...
@@ -85,6 +85,7 @@ class PluginInteractionForum extends PluginInteraction {
),
'fieldset'
=>
array
(
'type'
=>
'fieldset'
,
'class'
=>
'last mtl'
,
'collapsible'
=>
true
,
'collapsed'
=>
true
,
'legend'
=>
get_string
(
'forumsettings'
,
'interaction.forum'
),
...
...
htdocs/interaction/forum/topic.php
View file @
f163fa6c
...
...
@@ -75,10 +75,10 @@ if ($membership && !$topic->forumsubscribed) {
'autofocus'
=>
false
,
'elements'
=>
array
(
'submit'
=>
array
(
'type'
=>
'button'
,
'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'
),
'class'
=>
$topic
->
topicsubscribed
?
'btn btn-default'
:
'btn btn-default'
,
'value'
=>
$topic
->
topicsubscribed
?
'<span class="fa fa-
times fa-lg
text-danger
prs
"></span>
'
.
get_string
(
'unsubscribefromtopic'
,
'interaction.forum'
)
:
'<span class="fa fa-
star fa-lg
text-primary
prs
"></span>'
.
get_string
(
'subscribetotopic'
,
'interaction.forum'
),
'help'
=>
false
),
'topic'
=>
array
(
...
...
htdocs/interaction/forum/view.php
View file @
f163fa6c
...
...
@@ -182,7 +182,7 @@ if ($membership) {
'type'
=>
'button'
,
'usebuttontag'
=>
true
,
'class'
=>
'btn btn-default'
,
'value'
=>
$forum
->
subscribed
?
'<span class="fa fa-lg fa-
star-o
prs text-danger"></span> '
.
get_string
(
'unsubscribefromforum'
,
'interaction.forum'
)
:
'<span class="fa fa-lg fa-star prs text-primary"></span> '
.
get_string
(
'subscribetoforum'
,
'interaction.forum'
),
'value'
=>
$forum
->
subscribed
?
'<span class="fa fa-lg fa-
times
prs text-danger"></span> '
.
get_string
(
'unsubscribefromforum'
,
'interaction.forum'
)
:
'<span class="fa fa-lg fa-star prs text-primary"></span> '
.
get_string
(
'subscribetoforum'
,
'interaction.forum'
),
'help'
=>
false
),
'forum'
=>
array
(
...
...
htdocs/js/viewmenu.js
View file @
f163fa6c
...
...
@@ -23,7 +23,7 @@ function addFeedbackError(form, data) {
}
function
addFeedbackSuccess
(
form
,
data
)
{
addElementClass
(
'
add_feedback_form
'
,
'
hidden
'
);
//
addElementClass('add_feedback_form', 'hidden');
if
(
$
(
'
overlay
'
))
{
removeElement
(
'
overlay
'
);
}
...
...
@@ -55,7 +55,7 @@ function addFeedbackSuccess(form, data) {
}
function
objectionSuccess
(
form
,
data
)
{
addElementClass
(
'
objection_form
'
,
'
hidden
'
);
//
addElementClass('objection_form', 'hidden');
$
(
'
objection_form_message
'
).
value
=
''
;
rewriteCancelButtons
();
formSuccess
(
form
,
data
);
...
...
htdocs/lang/en.utf8/view.php
View file @
f163fa6c
...
...
@@ -57,8 +57,8 @@ $string['reallyaddaccesstoemptyview'] = 'Your page contains no blocks. Do you re
$string
[
'viewdeleted'
]
=
'Page deleted'
;
$string
[
'viewsubmitted'
]
=
'Page submitted'
;
$string
[
'deletethisview'
]
=
'Delete this page'
;
$string
[
'submitthisviewto'
]
=
'Submit this page
to
'
;
$string
[
'submitthiscollectionto'
]
=
'Submit this collection
to
'
;
$string
[
'submitthisviewto'
]
=
'Submit this page'
;
$string
[
'submitthiscollectionto'
]
=
'Submit this collection'
;
$string
[
'forassessment'
]
=
'for assessment'
;
$string
[
'accessfromdate2'
]
=
'Nobody else can see this page before %s.'
;
$string
[
'accessuntildate2'
]
=
'Nobody else can see this page after %s.'
;
...
...
htdocs/lib/group.php
View file @
f163fa6c
...
...
@@ -1375,31 +1375,38 @@ function group_view_submission_form($groupid) {
return
pieform
(
array
(
'name'
=>
'group_view_submission_form_'
.
$groupid
,
'method'
=>
'post'
,
'renderer'
=>
'
oneline
'
,
'class'
=>
'form-inline'
,
'renderer'
=>
'
div
'
,
'class'
=>
'form-inline
pts pbs
'
,
'autofocus'
=>
false
,
'successcallback'
=>
'group_view_submission_form_submit'
,
'elements'
=>
array
(
'text1'
=>
array
(
'class'
=>
'
mrm
'
,
'class'
=>
'
inline text-small
'
,
'type'
=>
'html'
,
'value'
=>
get_string
(
'submit'
,
'group'
)
.
' '
,
),
'options'
=>
array
(
'type'
=>
'select'
,
'class'
=>
'mrs'
,
'collapseifoneoption'
=>
false
,
'optgroups'
=>
$optgroups
,
'options'
=>
$options
,
),
'text2'
=>
array
(
'type'
=>
'html'
,
'class'
=>
'forassessment
mrs
'
,
'class'
=>
'forassessment
text-small
'
,
'value'
=>
get_string
(
'forassessment'
,
'view'
),
),
'submit'
=>
array
(
'type'
=>
'submit'
,
'class'
=>
'btn btn-primary btn-sm'
,
'value'
=>
get_string
(
'submit'
)
'inputgroup'
=>
array
(
'type'
=>
'fieldset'
,
'class'
=>
'input-group'
,
'elements'
=>
array
(
'options'
=>
array
(
'type'
=>
'select'
,
'class'
=>
'form-control'
,
'collapseifoneoption'
=>
false
,
'optgroups'
=>
$optgroups
,
'options'
=>
$options
,
),
'submit'
=>
array
(
'type'
=>
'button'
,
'usebuttontag'
=>
true
,
'class'
=>
'btn btn-primary input-group-btn '
,
'value'
=>
get_string
(
'submit'
)
),
),
),
'group'
=>
array
(
'type'
=>
'hidden'
,
...
...
htdocs/lib/license.php
View file @
f163fa6c
...
...
@@ -281,7 +281,7 @@ function render_license($artefact) {
if
(
!
empty
(
$details
))
{
$html
=
'<a href="'
.
hsc
(
$license
)
.
'" class="license">'
;
if
(
$details
->
icon
)
{
$html
.
=
'<img src="'
.
license_icon_url
(
$details
->
icon
)
.
'" class="license-icon"'
.
$html
.
=
'<img src="'
.
license_icon_url
(
$details
->
icon
)
.
'" class="license-icon
prm
"'
.
'alt="'
.
get_string
(
'licenseiconalt'
)
.
'">'
;
}
$html
.
=
hsc
(
$details
->
displayname
)
.
'</a>'
;
...
...
htdocs/lib/objectionable.php
View file @
f163fa6c
...
...
@@ -36,6 +36,7 @@ function objection_form() {
$form
[
'elements'
][
'submit'
]
=
array
(
'type'
=>
'submitcancel'
,
'class'
=>
'btn btn-success'
,
'value'
=>
array
(
get_string
(
'notifyadministrator'
),
get_string
(
'cancel'
)),
'confirm'
=>
array
(
get_string
(
'notifyadministratorconfirm'
)),
);
...
...
@@ -132,6 +133,7 @@ function notrude_form() {
return
array
(
'name'
=>
'notrude_form'
,
'class'
=>
'form-inline'
,
'method'
=>
'post'
,
'elements'
=>
array
(
'objection'
=>
array
(
...
...
@@ -140,10 +142,12 @@ function notrude_form() {
),
'text'
=>
array
(
'type'
=>
'html'
,
'class'
=>
'pbm'
,
'value'
=>
get_string
(
'viewobjectionableunmark'
,
'view'
),
),
'submit'
=>
array
(
'type'
=>
'submit'
,
'class'
=>
'btn btn-default'
,
'value'
=>
get_string
(
'notobjectionable'
),
),
),
...
...
htdocs/lib/view.php
View file @
f163fa6c
...
...
@@ -3706,7 +3706,7 @@ class View {
$searchform
=
array
(
'name'
=>
'searchviews'
,
'checkdirtychange'
=>
false
,
'class'
=>
'search-views-form form-inline'
,
'class'
=>
'search-views-form form-inline
ptl pbl
'
,
'elements'
=>
array
(
'query'
=>
array
(
'type'
=>
'text'
,
...
...
@@ -6288,26 +6288,38 @@ function view_group_submission_form($view, $tutorgroupdata, $returnto=null) {
$form
=
array
(
'name'
=>
'view_group_submission_form_'
.
$viewid
,
'method'
=>
'post'
,
'renderer'
=>
'oneline'
,
'renderer'
=>
'div'
,
'class'
=>
'form-inline ptl pbl'
,
'autofocus'
=>
false
,
'successcallback'
=>
'view_group_submission_form_submit'
,
'elements'
=>
array
(
'text1'
=>
array
(
'type'
=>
'html'
,
'class'
=>
'inline'
,
'value'
=>
''
,
),
'options'
=>
array
(
'type'
=>
'select'
,
'collapseifoneoption'
=>
false
,
'options'
=>
$options
,
),
'text2'
=>
array
(
'type'
=>
'html'
,
'class'
=>
'prm'
,
'value'
=>
get_string
(
'forassessment'
,
'view'
),
),
'submit'
=>
array
(
'type'
=>
'submit'
,
'value'
=>
get_string
(
'submit'
)
'inputgroup'
=>
array
(
'type'
=>
'fieldset'
,
'class'
=>
'input-group'
,
'elements'
=>
array
(
'options'
=>
array
(
'type'
=>
'select'
,
'class'
=>
'form-control'
,
'collapseifoneoption'
=>
false
,
'options'
=>
$options
,
),
'submit'
=>
array
(
'type'
=>
'button'
,
'usebuttontag'
=>
true
,
'class'
=>
'btn btn-primary input-group-btn'
,
'value'
=>
get_string
(
'submit'
)
)
),
),
'returnto'
=>
array
(
'type'
=>
'hidden'
,
...
...
htdocs/lib/web.php
View file @
f163fa6c
...
...
@@ -3775,7 +3775,7 @@ function build_pagination($params) {
}
// Begin building the output
$output
=
'<div id="'
.
$params
[
'id'
]
.
'" class="pagination-wrapper'
;
$output
=
'<div id="'
.
$params
[
'id'
]
.
'" class="pagination-wrapper
ptl
'
;
if
(
isset
(
$params
[
'class'
]))
{
$output
.
=
' '
.
hsc
(
$params
[
'class'
]);
}
...
...
htdocs/skin/delete.php
View file @
f163fa6c
...
...
@@ -49,7 +49,7 @@ $form = pieform(array(
'elements'
=>
array
(
'submit'
=>
array
(
'type'
=>
'submitcancel'
,
'class'
=>
'btn btn-
success
'
,
'class'
=>
'btn btn-
default
'
,
'value'
=>
array
(
get_string
(
'yes'
),
get_string
(
'no'
)),
'goto'
=>
get_config
(
'wwwroot'
)
.
$goto
,
)
...
...
htdocs/skin/index.php
View file @
f163fa6c
...
...
@@ -37,7 +37,7 @@ $form = pieform(array(
'name'
=>
'filter'
,
'method'
=>
'post'
,
'renderer'
=>
'div'
,
'class'
=>
'form-inline'
,
'class'
=>
'form-inline
ptl pbl
'
,
'elements'
=>
array
(
'inputgroup'
=>
array
(
'type'
=>
'fieldset'
,
...
...
htdocs/theme/bootstrap/artefact/blog/templates/render/blogpost_renderfull.tpl
View file @
f163fa6c
...
...
@@ -4,15 +4,23 @@
<div
id=
"blogpost-
{
$postid
}
"
class=
"panel-body"
>
{
if
$artefacttitle
}
<h3
class=
"title"
>
{
$artefacttitle
|
safe
}
</h3>
{/
if
}
<div
class=
"postdetails metadata mbm"
>
{
$postedbyon
}
</div>
{
$artefactdescription
|
clean_html
|
safe
}
<div
class=
"postdetails metadata mbm"
>
<span
class=
"fa fa-calendar mrs"
></span>
{
$postedbyon
}
</div>
{
if
$artefact
->
get
(
'tags'
)
}
<div
class=
"tags"
>
{
str
tag
=
tags
}
:
{
list_tags
owner
=
$artefact
->
get
(
'owner'
)
tags
=
$artefact
->
get
(
'tags'
)
}
</div>
{/
if
}
{
if
$artefact
->
get
(
'tags'
)
}
<div
class=
"tags metadata"
>
<span
class=
"fa fa-tags"
></span>
<strong>
{
str
tag
=
tags
}
:
</strong>
{
list_tags
owner
=
$artefact
->
get
(
'owner'
)
tags
=
$artefact
->
get
(
'tags'
)
}
</div>
{/
if
}
{
$artefactdescription
|
clean_html
|
safe
}
{
if
$license
}
<div
class=
"postlicense"
>
<div
class=
"postlicense
mtm mbl
"
>
{
$license
|
safe
}
</div>
{/
if
}
...
...
htdocs/theme/bootstrap/artefact/blog/templates/viewposts.tpl
View file @
f163fa6c
{
foreach
from
=
$posts
item
=
post
}
<div
class=
"post ptm
pbm
"
>
<div
class=
"post ptm
mbxl
"
>
<h4
class=
"title"
>
<a
href=
"
{
$WWWROOT
}
artefact/artefact.php?artefact=
{
$post
->
id
}
&view=
{
$options.viewid
}
"
>
{
$post
->
title
}
</a>
</h4>
...
...
@@ -53,19 +53,21 @@
{/
if
}
{
if
$options.viewid
&&
(
$post
->
commentcount
||
$post
->
commentcount
===
0
)
}
<div
class=
"comments"
>
<div
class=
"comments
clearfix ptm mts
"
>
{
if
$post
->
commentcount
>
0
}
<a
id=
"block_0
{
$post
->
id
}{
$options.blockid
}
"
class=
"commentlink"
href=
"
{
$WWWROOT
}
artefact/artefact.php?artefact=
{
$post
->
id
}
&view=
{
$options.viewid
}
"
>
{
str
tag
=
Comments
section
=
artefact
.
comment
}
(
{
$post
->
commentcount
}
)
</a>
<a
id=
"block_0
{
$post
->
id
}{
$options.blockid
}
"
class=
"commentlink
text-thin pull-left
"
href=
"
{
$WWWROOT
}
artefact/artefact.php?artefact=
{
$post
->
id
}
&view=
{
$options.viewid
}
"
>
{
str
tag
=
Comments
section
=
artefact
.
comment
}
(
{
$post
->
commentcount
}
)
</a>
{
else
}
{
if
$allowcomments
}
<span
class=
"nocomments"
>
{
str
tag
=
Comments
section
=
artefact
.
comment
}
(
{
$post
->
commentcount
}
)
</span>
<span
class=
"nocomments text-thin pull-left"
>
{
str
tag
=
Comments
section
=
artefact
.
comment
}
(
{
$post
->
commentcount
}
)
</span>
{/
if
}
{
if
$post
->
allowcomments
}
<p
class=
"text-right"
>
<a
class=
"addcomment text-thin"
href=
"
{
$WWWROOT
}
artefact/artefact.php?artefact=
{
$post
->
id
}
&view=
{
$options.viewid
}
"
>
<span
class=
"fa fa-lg fa-plus text-primary prs"
></span>
{
str
tag
=
addcomment
section
=
artefact
.
comment
}
</a>
</p>
{/
if
}
{/
if
}
{
if
$post
->
allowcomments
}
<a
class=
"mtl mbl btn btn-default btn-sm btn-block addcomment"
href=
"
{
$WWWROOT
}
artefact/artefact.php?artefact=
{
$post
->
id
}
&view=
{
$options.viewid
}
"
>
<span
class=
"fa fa-lg fa-plus text-primary prs"
></span>
{
str
tag
=
addcomment
section
=
artefact
.
comment
}
</a>
{/
if
}
</div>
{/
if
}
...
...
htdocs/theme/bootstrap/artefact/file/blocktype/image/templates/image.tpl
View file @
f163fa6c
<div
class=
"
text-center
imageblock panel-body"
itemscope
itemtype=
"http://schema.org/ImageObject"
>
<div
class=
"imageblock panel-body"
itemscope
itemtype=
"http://schema.org/ImageObject"
>
<div
class=
"image"
>
<a
href=
"
{
$url
}
"
>
<img
src=
"
{
$src
}
"
alt=
"
{
$description
}
"
itemprop=
"contentURL"
>
...
...
@@ -10,8 +10,7 @@
{
$description
}
</div>
{/
if
}
{
if
$commentcount
||
$commentcount
===
0
}
{
$comments
|
safe
}
{/
if
}
</div>
{
if
$commentcount
||
$commentcount
===
0
}
{
$comments
|
safe
}
{/
if
}
htdocs/theme/bootstrap/artefact/plans/templates/delete.tpl
View file @
f163fa6c
{
include
file
=
"header.tpl"
}
<div
class=
"deletemessage"
>
<h2>
{
$subheading
}
</h2>
<p
class=
"lead
text-small
"
>
{
$message
}
</p>
<p
class=
"lead"
>
{
$message
}
</p>
{
$form
|
safe
}
</div>
{
include
file
=
"footer.tpl"
}
htdocs/theme/bootstrap/blocktype/groupviews/templates/groupviews.tpl
View file @
f163fa6c
...
...
@@ -121,7 +121,7 @@
{/
foreach
}
{/
if
}
{
if
$group_view_submission_form
}
<li
class=
"list-group-item
text-small
list-group-item-default"
>
<li
class=
"list-group-item list-group-item-default"
>
<div
class=
"submissionform"
>
{
$group_view_submission_form
|
safe
}
</div>
...
...
htdocs/theme/bootstrap/interaction/forum/templates/deletetopic.tpl
View file @
f163fa6c
{
include
file
=
"header.tpl"
}
<h2>
{
$subheading
}
</h2>
<div
class=
"message deletemessage"
>
{
$deleteform
|
safe
}
</div>
<div
class=
"message deletemessage"
>
{
$deleteform
|
safe
}
</div>
{
include
file
=
"interaction:forum:simplepost.tpl"
post
=
$topic
groupadmins
=
$groupadmins
}
{
include
file
=
"footer.tpl"
}
htdocs/theme/bootstrap/interaction/forum/templates/topics.tpl
View file @
f163fa6c
...
...
@@ -38,9 +38,14 @@
</span>
</h3>
<div
class=
"text-small threaddetails mtm"
>
<p>
{
$topic
->
body
|
str_shorten_html
:
50
:
true
:
false
|
safe
}
</p>
{
if
$publicgroup
}
<a
href=
"
{
$topic
->
feedlink
}
"
>
<span
class=
"fa fa-rss"
></span>
</a>
{/
if
}
</h3>
<div
class=
"detail text-small mts"
>
{
$topic
->
body
|
str_shorten_html
:
80
:
true
:
false
|
safe
}
</div>
</td>
<td
class=
"postscount text-center"
>
...
...
@@ -66,19 +71,20 @@
</td>
<td
class=
"control-buttons"
>
{
if
$moderator
}
<div
class=
"btn-group"
>
<a
href=
"
{
$WWWROOT
}
interaction/forum/edittopic.php?id=
{
$topic
->
id
}
&returnto=view"
class=
"btn btn-default btn-xs"
title=
"
{
str
tag
=
"edit"
}
"
>
<span
class=
"fa fa-pencil"
></span>
<span
class=
"sr-only"
>
{
str
tag
=
edittopicspecific
section
=
interaction
.
forum
arg1
=
$topic
->
subject
}
</span>
</a>
<a
href=
"
{
$WWWROOT
}
interaction/forum/deletetopic.php?id=
{
$topic
->
id
}
&returnto=view"
class=
"btn btn-d
anger
btn-xs"
title=
"
{
str
tag
=
"delete"
}
"
>
<span
class=
"fa fa-trash"
></span>
<a
href=
"
{
$WWWROOT
}
interaction/forum/deletetopic.php?id=
{
$topic
->
id
}
&returnto=view"
class=
"btn btn-d
efault
btn-xs"
title=
"
{
str
tag
=
"delete"
}
"
>
<span
class=
"fa fa-trash
text-danger
"
></span>
<span
class=
"sr-only"
>
{
str
tag
=
deletetopicspecific
section
=
interaction
.
forum
arg1
=
$topic
->
subject
}
</span>
</a>
</div>
</td>
{/
if
}
</tr>
...
...
htdocs/theme/bootstrap/interaction/forum/templates/view.tpl
View file @
f163fa6c
...
...
@@ -47,6 +47,7 @@
</div>
<div
id=
"viewforum"
>
<
<<<<<<
HEAD
{
if
$stickytopics
||
$regulartopics
}
<
form
action=
""
method=
"post"
class=
"mtxl"
>
...
...
@@ -61,6 +62,46 @@
</tr>
</thead>
=======
<h3
class=
"pull-left"
>
{
str
tag
=
Topics
section
=
"interaction.forum"
}
</h3>
{
if
$membership
&&
(
$moderator
||
(
$forum
->
newtopicusers
!=
'moderators'
)
&&
$ineditwindow
)
}
<div
class=
"btn-top-right ptl pbxl text-right"
>
<div
class=
"btn-group"
>
<a
href=
"
{
$WWWROOT
}
interaction/forum/edittopic.php?forum=
{
$forum
->
id
}
"
class=
"btn btn-default newforumtopic"
>
<span
class=
"fa fa-plus fa-lg prs text-primary"
></span>
{
str
tag
=
"newtopic"
section
=
"interaction.forum"
}
</a>
{
if
$admin
}
<a
href=
"
{
$WWWROOT
}
interaction/edit.php?id=
{
$forum
->
id
}
"
class=
"btn btn-default editforumtitle"
>
<span
class=
"fa fa-cog"
></span>
{
str
tag
=
"edittitle"
section
=
"interaction.forum"
}
</a>
<a
href=
"
{
$WWWROOT
}
interaction/delete.php?id=
{
$forum
->
id
}
"
class=
"btn btn-default deleteforum"
>
<span
class=
"fa fa-trash text-danger"
></span>
{
str
tag
=
"deleteforum"
section
=
"interaction.forum"
}
</a>
{/
if
}
</div>
</div>
{/
if
}
{
if
$stickytopics
||
$regulartopics
}
<form
action=
""
method=
"post"
class=
"ptxl"
>
<table
id=
"forumtopicstable"
class=
"table fullwidth"
>
<tr>
<th
class=
"narrow"
></th>
<th
class=
"narrow"
></th>
<th
class=
"topic"
>
{
str
tag
=
"Topic"
section
=
"interaction.forum"
}
</th>
<th
class=
"posterth"
>
{
str
tag
=
"Poster"
section
=
"interaction.forum"
}
</th>
<th
class=
"postscount center"
>
{
str
tag
=
"Posts"
section
=
"interaction.forum"
}
</th>