Author: deepak
Date: Sat Mar 9 06:34:33 2019
New Revision: 1855086
URL: http://svn.apache.org/viewvc?rev=1855086&view=rev
Log:
Improved: Markup improvement for the blogs screen
(OFBIZ-10578)
Thanks Nitish Mishra and Parakh Maheshwari for your contribution
Modified:
ofbiz/ofbiz-plugins/trunk/ecommerce/template/blog/BlogContentAltLink.ftl
ofbiz/ofbiz-plugins/trunk/ecommerce/widget/blog/BlogMenus.xml
ofbiz/ofbiz-plugins/trunk/ecommerce/widget/blog/BlogScreens.xml
Modified:
ofbiz/ofbiz-plugins/trunk/ecommerce/template/blog/BlogContentAltLink.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/blog/BlogContentAltLink.ftl?rev=1855086&r1=1855085&r2=1855086&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ecommerce/template/blog/BlogContentAltLink.ftl
(original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/blog/BlogContentAltLink.ftl
Sat Mar 9 06:34:33 2019
@@ -16,8 +16,9 @@ KIND, either express or implied. See th
specific language governing permissions and limitations
under the License.
-->
-
-<a href="<@OfbizContentAltUrl contentId=blog.contentId
viewContent='ViewBlogArticle'/>" >
- ${blog.contentName} [${blog.contentId}]
-</a>
+<div class="card-header">
+ <a href="<@OfbizContentAltUrl contentId=blog.contentId
viewContent='ViewBlogArticle'/>" >
+ ${blog.contentName} [${blog.contentId}]
+ </a>
+</div>
Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/widget/blog/BlogMenus.xml
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/widget/blog/BlogMenus.xml?rev=1855086&r1=1855085&r2=1855086&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ecommerce/widget/blog/BlogMenus.xml (original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/widget/blog/BlogMenus.xml Sat Mar 9
06:34:33 2019
@@ -19,7 +19,7 @@
-->
<menus xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns="http://ofbiz.apache.org/Widget-Menu";
xsi:schemaLocation="http://ofbiz.apache.org/Widget-Menu
http://ofbiz.apache.org/dtds/widget-menu.xsd";>
- <menu name="ViewEdit" default-title-style="tabButton"
default-selected-style="tabButtonSelected" default-menu-item-name="all"
orientation="horizontal" menu-width="100%" default-widget-style="tabButton"
menu-container-style="blogmenuwrapper" title="" type="simple">
+ <menu name="ViewEdit" default-title-style="tabButton"
default-selected-style="tabButtonSelected" default-menu-item-name="all"
orientation="horizontal" menu-width="100%" default-widget-style="tabButton"
menu-container-style="card-header" title="" type="simple">
<menu-item name="edit" title="${uiLabelMap.CommonEdit}">
<condition>
<or>
@@ -27,7 +27,7 @@
<if-entity-permission entity-id="${blog.contentId}"
entity-name="Content" target-operation="CONTENT_UPDATE"/>
</or>
</condition>
- <link text="${uiLabelMap.CommonEdit}" target="EditBlogArticle"
style="buttontext">
+ <link text="${uiLabelMap.CommonEdit}" target="EditBlogArticle">
<parameter param-name="contentId" from-field="blog.contentId"/>
<parameter param-name="blogContentId"
from-field="parameters.blogContentId"/>
</link>
Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/widget/blog/BlogScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/widget/blog/BlogScreens.xml?rev=1855086&r1=1855085&r2=1855086&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ecommerce/widget/blog/BlogScreens.xml (original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/widget/blog/BlogScreens.xml Sat Mar 9
06:34:33 2019
@@ -39,19 +39,19 @@
<set field="crPerm.contentPurposeTypeId" value="ARTICLE"/>
</actions>
<widgets>
- <container style="bloghr">
- <container style="leftjustify">
- <link text="${blogContent.contentName} -
${blogContent.description}" target="MainBlog" style="blogtitle">
+ <container style="card">
+ <container style="card-header">
+ <link text="${blogContent.contentName} -
${blogContent.description}" target="MainBlog">
<parameter param-name="blogContentId"/>
</link>
</container>
- <container style="rightjustify">
+ <container style="card-body">
<section>
<condition>
<if-service-permission
service-name="genericContentPermission" main-action="CREATE"
context-map="crPerm"/>
</condition>
<widgets>
- <link text="${uiLabelMap.CommonAddNew}"
target="NewBlogArticle" style="buttontext">
+ <link text="${uiLabelMap.CommonAddNew}"
target="NewBlogArticle">
<parameter param-name="blogContentId"/>
</link>
</widgets>
@@ -114,7 +114,7 @@
<if-compare field="itemIndex"
operator="equals" type="Integer" value="0"/>
</condition>
<widgets>
- <container style="blogwrapper">
+ <container style="card">
<include-menu name="ViewEdit"
location="component://ecommerce/widget/blog/BlogMenus.xml"/>
<platform-specific><html><html-template
location="component://ecommerce/template/blog/BlogContentAltLink.ftl"/></html></platform-specific>
<!--<link text="${blog.contentName}
[${blog.contentId}]" target="ViewBlogArticle" style="blogheader">
@@ -126,7 +126,7 @@
<parameter
param-name="ownerContentId" from-field="blog.ownerContentId"/>
</link>
-->
- <container style="blogtext">
+ <container style="card-body">
<sub-content map-key="SUMMARY"
content-id="${blog.contentId}"/>
</container>
</container>
@@ -137,7 +137,7 @@
<if-compare field="itemIndex"
operator="greater" type="Integer" value="0"/>
</condition>
<widgets>
- <container style="blogwrapper">
+ <container style="card-body">
<include-menu name="ViewEdit"
location="component://ecommerce/widget/blog/BlogMenus.xml"/>
<!--<label text="${blog.contentName}
[${blog.contentId}]" style="blogheader"/>-->
<platform-specific><html><html-template
location="component://ecommerce/template/blog/BlogContentAltLink.ftl"/></html></platform-specific>
@@ -150,8 +150,8 @@
<parameter
param-name="ownerContentId" from-field="blog.ownerContentId"/>
</link>
-->
- <container style="blogtext">
- <label text="${blog.description}"
style="blogtext"/>
+ <container style="card-body">
+ <label text="${blog.description}"/>
</container>
</container>
</widgets>
