Merge pull request #14 from sitrontech/issue/47-new-page

Issue/47 new page
standardshub · Sep 13, 2020 · 22ccfff · 22ccfff
2 parents 4e0142e + 924a6e8
commit 22ccfff
Show file tree

Hide file tree

Showing 13 changed files with 95 additions and 19 deletions.
diff --git a/_includes/block_icon_cards.html b/_includes/block_icon_cards.html
@@ -31,13 +31,22 @@ <h2>{{include.header.title}}</h2>
         {% assign divCardImg = "service-card-img" %}
         {% assign imgClass = "img-fluid" %}
         {% endif %}
-        <div class="service-card text-center">
+        <div class="service-card text-{{ item.align || 'center' }}">
           <div class="{{ divCardImg }}">
             <img class="{{ imgClass }}" src="{{item.image}}" alt="">
           </div>
           <div class="service-card-body">
             <h3>{{item.title}}</h3>
             <p>{{ item.paragraph }}</p>
+            {% if item.button_style == 'link'  %}
+            {% assign buttonClassName = "" %}
+          {% else %}
+            {% assign buttonClassName = "button" %}
+          {% endif %}
+          {% if item.button_url && item.button_lable  %}
+             <a class="{{ buttonClassName}}"
+              href="{{ item.button_url }}">{{ item.button_lable }}</a>
+          {% endif %}
           </div>
         </div>
       </div>

diff --git a/_includes/block_image_cards.html b/_includes/block_image_cards.html
@@ -19,9 +19,15 @@ <h2>{{include.header.title}}</h2>
           <div class="card-blog-body">
             <h4>{{item.title}}</h4>
             <p>{{ item.paragraph }}</p>
-            <a class="button" href="{{ item.button_url }}"
-              >{{ item.button_lable }}</a
-            >
+            {% if item.button_style == 'link'  %}
+              {% assign buttonClassName = "" %}
+            {% else %}
+              {% assign buttonClassName = "button" %}
+            {% endif %}
+            {% if item.button_url && item.button_lable  %}
+            <a class="{{ buttonClassName}}" href="{{ item.button_url }}"
+              >{{ item.button_lable }}</a >
+            {% endif %}
           </div>
         </div>
         {% else %}

diff --git a/_includes/block_image_text.html b/_includes/block_image_text.html
@@ -15,7 +15,14 @@ <h2>{{include.header.title}}</h2>
         <div class="col-lg-6 col-md-6 pt-4 pb-4 align-self-center about-content">
           <h2>{{ include.title }}</h2>
           <p>{{ include.paragraph }}</p>
-          <a class="button" href="{{ include.button_url }}">{{ include.button_lable }}</a>
+          {% if item.button_style == 'link'  %}
+              {% assign buttonClassName = "" %}
+            {% else %}
+              {% assign buttonClassName = "button" %}
+            {% endif %}
+            {% if item.button_url && item.button_lable  %}
+            <a class="{{ buttonClassName}}" href="{{ include.button_url }}">{{ include.button_lable }}</a>
+            {% endif %}
         </div>
       </div>
     </div>
@@ -34,7 +41,14 @@ <h2>{{include.header.title}}</h2>
         <div class="col-lg-6 col-md-6 pr-5 pt-4 pb-4  align-self-center about-content">
           <h2>{{ include.title }}</h2>
           <p>{{ include.paragraph }}</p>
-          <a class="button" href="{{ include.button_url }}">{{ include.button_lable }}</a>
+          {% if item.button_style == 'link'  %}
+              {% assign buttonClassName = "" %}
+            {% else %}
+              {% assign buttonClassName = "button" %}
+            {% endif %}
+            {% if item.button_url && item.button_lable  %}
+            <a class="{{ buttonClassName}}" href="{{ include.button_url }}">{{ include.button_lable }}</a>
+            {% endif %}
         </div>
       </div>
     {% endif %}

diff --git a/_includes/block_text_cards.html b/_includes/block_text_cards.html
@@ -20,7 +20,15 @@ <h2>{{include.header.title}}</h2>
             <div class="text-{{item.image_align}}"><img class="" src="{{item.image}}" alt=""></div>
             <h2 style="height: 80px">{{ item.title }}</h2>
             <p>{{ item.paragraph }}</p>
-            <a class="button" href="{{ item.button_url }}">{{ item.button_lable }}</a>
+            {% if item.button_style == 'link'  %}
+              {% assign buttonClassName = "" %}
+            {% else %}
+              {% assign buttonClassName = "button" %}
+            {% endif %}
+            {% if item.button_url && item.button_lable  %}
+            <a class="{{ buttonClassName}}"
+                href="{{ item.button_url }}">{{ item.button_lable }}</a>
+            {% endif %}
         </div>
         {% endfor %}
       </div>

diff --git a/_includes/block_text_image.html b/_includes/block_text_image.html
@@ -12,7 +12,14 @@ <h2>{{include.header.title}}</h2>
         <div class="col-lg-6 col-md-6 pt-4 pb-4 align-self-center about-content">
           <h2>{{ include.title }}</h2>
           <p>{{ include.paragraph }}</p>
-          <a class="button" href="{{ include.button_url }}">{{ include.button_lable }}</a>
+          {% if item.button_style == 'link'  %}
+              {% assign buttonClassName = "" %}
+            {% else %}
+              {% assign buttonClassName = "button" %}
+            {% endif %}
+            {% if item.button_url && item.button_lable  %}
+            <a class="{{ buttonClassName}}" href="{{ include.button_url }}">{{ include.button_lable }}</a>
+            {% endif %}
         </div>
         <div class="col-lg-6 col-md-6 mb-4 mb-md-0 ">
             <img class="img-fluid" src="{{ include.image }}" alt="">
@@ -31,7 +38,14 @@ <h2>{{include.header.title}}</h2>
         <div class="col-lg-6 col-md-6 p-5 align-self-center about-content">
           <h2>{{ include.title }}</h2>
           <p>{{ include.paragraph }}</p>
-          <a class="button" href="{{ include.button_url }}">{{ include.button_lable }}</a>
+          {% if item.button_style == 'link'  %}
+              {% assign buttonClassName = "" %}
+            {% else %}
+              {% assign buttonClassName = "button" %}
+            {% endif %}
+            {% if item.button_url && item.button_lable  %}
+            <a class="{{ buttonClassName}}" href="{{ include.button_url }}">{{ include.button_lable }}</a>
+            {% endif %}
         </div>
         <div class="col-lg-6 col-md-6 mb-4 mb-md-0">
             <img class="img-fluid" src="{{ include.image }}" alt="">

diff --git a/about.markdown b/about.markdown
@@ -2,7 +2,7 @@
 layout: page
 title: About
 permalink: /about/
-order: 1
+order: 10
 blocks_before:
   - layout: "block_text"
     title: About Standard Hub

diff --git a/blog/index.md → blog.markdown b/blog/index.md → blog.markdown
@@ -2,7 +2,7 @@
 layout: page
 title: Blog
 permalink: /information/blog/
-order: 5
+order: 41
 subnav: true
 pagination: 
   enabled: true

diff --git a/contactus.markdown b/contactus.markdown
@@ -2,7 +2,7 @@
 layout: page
 title: Contact us
 permalink: /contactus/
-order: 7
+order: 50
 blocks_before:
   - layout: "block_image_banner"
     image: /assets/images/banner/banner-contactus.jpg

diff --git a/index.markdown b/index.markdown
@@ -19,30 +19,34 @@ blocks:
     image: assets/images/home/photo_example2.png
     button_lable: "Lean More"
     button_url: "https://www.google.com/"
+    button_style: "link" #display style as link | button(default)
   - layout: "block_image_text"
     title: Developers wanted
     paragraph: Standard Hub has more than 150 specifications defined at the Open Mobile Alliance, IOT Smart Objects created at the IPSO Alliance, and developer tools  and resources that facilitate the development of products based on LightweightM2M (LwM2M), the IoT industry’s protocol for device management.
     image: assets/images/home/photo_example1.png
     button_lable: "See More"
     button_url: ""
+    # button_style: "link" #display style as link | button(default)
   - layout: "block_text_fluid"
     title: Our Services
     paragraph: We have assembled a set of tools, a team, and procedures that are well-suited to a small group of companies with a common interest to spin up a simple effort that results in a pre-standards body of work, as well as a large scale, well-funded project with aspirations of creating a worldwide standard. <br/><br/>We can guide you through the consortium lifecycle from formation to the ongoing governance, the technical collaboration, and the finance and administration. We consider ourselves a part of your team with a singular focus on the execution of your mission.  We manage all the core business functions, so you can concentrate on delivering the best possible specifications for your industry.
     paragraph_aligh: left # center | left
     image: assets/images/home/section-icon.png
   - layout: "block_icon_cards"
-    card_per_line: 4
+    card_per_line: 3
     cards:
-      - title: Formation
+      - title: Formationsss
         paragraph: There are a number of ways to effectively start a new technical standards project. We will guide you to the path that best fits your needs.
         image: assets/images/home/service1.png
         button_lable: "Lean More"
-        button_url: ""
+        # button_url: ""
+        align: center # center | left | right
       - title: Governance
         paragraph: Technical consortia must comply with the laws that govern non-profits and they should be governed neutrally for the benefit of all their stakeholders.
         image: assets/images/home/service2.png
         button_lable: "Lean More"
         button_url: ""
+        button_style: "link" #display style as link | button(default)
       - title: Working Group Admin
         paragraph: We have helped consortium members create hundreds of specifications.  Every effort is unique, but they have some common features.
         image: assets/images/home/service3.png
@@ -82,6 +86,7 @@ blocks:
         image_align: right # left|center|right
         button_lable: "Lean More"
         button_url: ""
+        button_style: "link"
       - title: Governance
         paragraph: Technical consortia must comply with the laws that govern non-profits and they should be governed neutrally for the benefit of all their stakeholders.
         image: assets/images/home/section-icon.png
@@ -187,6 +192,26 @@ blocks:
         image: assets/images/gallery/g1.png
         button_lable: "Lean More"
         button_url: ""
+        button_style: "link" #display style as link | button(default)
+      - title: Content Delivery
+        paragraph: The CD Working Group is chartered to define the basic delivery mechanisms, bi-directional exchange mechanisms, and the processing of key content formats, including the semantics and user agents, behavior and programming interfaces.
+        image: assets/images/gallery/g2.png
+        button_lable: "Lean More"
+        button_url: ""
+      - title: Interoperability
+        paragraph: The IOP Working Group produces high quality test specifications, facilitating testing of implementations of OMA SpecWorks specifications and, in some cases, producing TTCN test code for the validation of specifications.
+        image: assets/images/gallery/g3.png
+        button_lable: "Lean More"
+        button_url: ""
+  - layout: "block_image_cards"
+    card_per_line: 4
+    cards:
+      - title: Communications
+        paragraph: The COM Working Group is responsible for service layer standardization of communications related technologies, including areas such as Messaging, Push-to-talk over Cellular, Presence, Contact Information and Spam Reporting.
+        image: assets/images/gallery/g1.png
+        button_lable: "Lean More"
+        button_url: ""
+        button_style: "link" #display style as link | button(default)
       - title: Content Delivery
         paragraph: The CD Working Group is chartered to define the basic delivery mechanisms, bi-directional exchange mechanisms, and the processing of key content formats, including the semantics and user agents, behavior and programming interfaces.
         image: assets/images/gallery/g2.png

diff --git a/information.markdown b/information.markdown
@@ -2,6 +2,6 @@
 layout: page
 title: information
 permalink: /information/
-order: 4
+order: 40
 parent: true
 ---
diff --git a/partner.markdown b/partner.markdown
@@ -2,7 +2,7 @@
 layout: page
 title: Partners
 permalink: /partners/
-order: 3
+order: 30
 blocks_before:
   - layout: "block_image_banner"
     image: /assets/images/banner/banner-contactus.jpg

diff --git a/resources/index.md → resources.markdown b/resources/index.md → resources.markdown
@@ -2,7 +2,7 @@
 layout: page
 title: Resources
 permalink: /information/resources/
-order: 6
+order: 42
 subnav: true
 pagination: 
   enabled: true

diff --git a/services.markdown b/services.markdown
@@ -2,7 +2,7 @@
 layout: page
 title: Services
 permalink: /services/
-order: 2
+order: 20
 blocks_before:
   - layout: "block_image_banner"
     image: /assets/images/banner/banner-contactus.jpg