Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
afi
opacce
Commits
46d2246d
Commit
46d2246d
authored
Nov 18, 2019
by
Laurent
Browse files
hotline #95887 use same article rendering in phone version as opac one
parent
61482221
Pipeline
#8698
failed with stage
in 83 minutes and 58 seconds
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
26 additions
and
3 deletions
+26
-3
VERSIONS_HOTLINE/95887
VERSIONS_HOTLINE/95887
+1
-0
application/modules/telephone/views/scripts/cms/articleview.phtml
...ion/modules/telephone/views/scripts/cms/articleview.phtml
+3
-2
public/opac/mobile/css/global.css
public/opac/mobile/css/global.css
+4
-0
tests/application/modules/telephone/controllers/CmsControllerTest.php
...ation/modules/telephone/controllers/CmsControllerTest.php
+18
-1
No files found.
VERSIONS_HOTLINE/95887
0 → 100644
View file @
46d2246d
- ticket #95887 : Version smartphone: affichage de la carte OSM et boutons de partage sur les événements agenda
\ No newline at end of file
application/modules/telephone/views/scripts/cms/articleview.phtml
View file @
46d2246d
...
...
@@ -3,5 +3,6 @@
<h1>
<?php
echo
$this
->
article
->
titre
?>
</h1>
<div
class=
'article pave'
>
<?php
echo
$this
->
article
->
getFullContent
();
?>
</div>
\ No newline at end of file
<?php
echo
$this
->
getHelper
(
'Article_RenderFullContent'
)
->
renderArticle
(
$this
->
article
);
?>
</div>
public/opac/mobile/css/global.css
View file @
46d2246d
...
...
@@ -572,3 +572,7 @@ li.pret_en_retard a {
padding
:
0
20px
0
0
;
}
dl
.article_info
{
display
:
none
;
}
tests/application/modules/telephone/controllers/CmsControllerTest.php
View file @
46d2246d
...
...
@@ -27,7 +27,16 @@ abstract class AbstractCmsControllerTelephoneTestCase extends TelephoneAbstractC
Class_Article
::
getLoader
()
->
newInstanceWithId
(
4
)
->
setTitre
(
'Fete de la patate'
)
->
setDescription
(
'A Annecy !'
);
->
setDescription
(
'A Annecy !'
)
->
setLieu
(
$this
->
fixture
(
'Class_Lieu'
,
[
'id'
=>
'4156465'
,
'libelle'
=>
'Annecy'
,
'adresse'
=>
'Rue des tomates'
,
'code_postal'
=>
'74000'
,
'latitude'
=>
'45.9262592'
,
'longitude'
=>
'6.1459837'
]));
;
Storm_Test_ObjectWrapper
::
onLoaderOfModel
(
'Class_Article'
)
...
...
@@ -81,6 +90,14 @@ class CmsControllerTelephoneTest extends AbstractCmsControllerTelephoneTestCase
function
contentShouldBeAAnnecy
()
{
$this
->
assertXPathContentContains
(
'//div[@class="article pave"]'
,
'A Annecy !'
);
}
/** @test */
public
function
divShouldContainsStaticMap
()
{
$this
->
assertXPath
(
'//div[@class="lieu"]//img[contains(@src,"https://smap.afi-sa.net/staticmap.php")]'
,
$this
->
_response
->
getBody
());
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment