From 38860fdb22aa3e183a38b2a889dc714abd4c4823 Mon Sep 17 00:00:00 2001
From: chihiro-adachi <chihiro_adachi@lockon.co.jp>
Date: Tue, 10 Jan 2017 17:59:32 +0900
Subject: [PATCH 1/2] =?UTF-8?q?=E8=A1=A8=E7=A4=BA=E7=A2=BA=E8=AA=8D?=
 =?UTF-8?q?=E3=83=AA=E3=83=B3=E3=82=AF=E3=82=92=E8=BF=BD=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Controller/ProductPriorityController.php |  2 ++
 Resource/template/admin/index.twig       | 32 ++++++++++++++++--------
 2 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/Controller/ProductPriorityController.php b/Controller/ProductPriorityController.php
index 5c13476..b2a2c64 100644
--- a/Controller/ProductPriorityController.php
+++ b/Controller/ProductPriorityController.php
@@ -14,6 +14,7 @@
 use Eccube\Application;
 use Eccube\Controller\AbstractController;
 use Plugin\ProductPriority\Constant;
+use Plugin\ProductPriority\Entity\Config;
 use Plugin\ProductPriority\Entity\ProductPriority;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
@@ -68,6 +69,7 @@ public function index(Application $app, Request $request, $categoryId = null)
                 'searchProductModalForm' => $searchProductModalForm->createView(),
                 'Priorities' => $Priorities,
                 'categoryId' => is_null($categoryId) ? Constant::CATEGORY_ID_ALL_PRODUCT : $categoryId,
+                'Config' => $app['eccube.plugin.product_priority.repository.config']->find(Config::ID)
             )
         );
     }
diff --git a/Resource/template/admin/index.twig b/Resource/template/admin/index.twig
index ef20f4b..1647a17 100644
--- a/Resource/template/admin/index.twig
+++ b/Resource/template/admin/index.twig
@@ -308,12 +308,14 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
             <div class="box">
                 <div class="box-header">
                     <div class="box-title">
-                        商品おすすめ順登録
-                        <span class="glyphicon glyphicon-question-sign"
-                              data-toggle="tooltip"
-                              data-placement="right"
-                              data-html="true"
-                              data-title="<p align='left'>カテゴリ毎に、おすすめする商品を登録できます。おすすめ商品を登録後、並び順をドラッグ＆ドロップで設定してください。</p>"></span>
+                        <ul class="list-inline">
+                            <li>商品おすすめ順登録</li>
+                            <li><span class="glyphicon glyphicon-question-sign"
+                                  data-toggle="tooltip"
+                                  data-placement="right"
+                                  data-html="true"
+                                  data-title="<p align='left'>カテゴリ毎に、おすすめする商品を登録できます。おすすめ商品を登録後、並び順をドラッグ＆ドロップで設定してください。</p>"></span></li>
+                        </ul>
                     </div>
                 </div>
                 <div class="box-body">
@@ -323,15 +325,23 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
                                 {{ form_widget(form.category) }}
                             </div>
                         </div>
-                        <div class="col-md-2">
+                        <div class="col-md-4">
                             <div class="form-group">
-                                <button type="button" class="btn btn-default btn-block" data-toggle="modal"
-                                        data-target="#searchProductModal">おすすめ商品登録
-                                </button>
+                                <ul class="list-inline">
+                                    <li>
+                                        <button type="button" class="btn btn-default btn-block" data-toggle="modal"
+                                                data-target="#searchProductModal">おすすめ商品登録
+                                        </button>
+                                    </li>
+                                    <li><a href="{{ path('product_list', {
+                                            'category_id' : categoryId ? categoryId : '',
+                                            'orderby' : Config.order_by_id
+                                        }) }}" target="_blank"><span class="glyphicon glyphicon-new-window"></span><span class="hidden-xs"> 表示を確認</span></a></li>
+                                </ul>
                             </div>
                         </div>
                         {% if Priorities|length > 0 %}
-                            <div class="col-md-6">
+                            <div class="col-md-4">
                                 <div class="row">
                                     <div class="col-md-4 col-md-offset-8">
                                         <div class="form-group">

From 21e10834beb4dc8f58f3d58a4c4910dd5936f2d7 Mon Sep 17 00:00:00 2001
From: chihiro-adachi <chihiro_adachi@lockon.co.jp>
Date: Tue, 10 Jan 2017 18:26:17 +0900
Subject: [PATCH 2/2] =?UTF-8?q?=E5=89=8A=E9=99=A4=E3=83=9C=E3=82=BF?=
 =?UTF-8?q?=E3=83=B3=E3=81=AE=E8=A1=A8=E7=A4=BA=E8=AA=BF=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Resource/template/admin/index.twig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resource/template/admin/index.twig b/Resource/template/admin/index.twig
index 1647a17..213842d 100644
--- a/Resource/template/admin/index.twig
+++ b/Resource/template/admin/index.twig
@@ -343,7 +343,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
                         {% if Priorities|length > 0 %}
                             <div class="col-md-4">
                                 <div class="row">
-                                    <div class="col-md-4 col-md-offset-8">
+                                    <div class="col-md-6 col-md-offset-6">
                                         <div class="form-group">
                                             <button id="delete-checked" type="button" class="btn btn-default btn-block">
                                                 削除