Merge remote-tracking branch 'origin/master'

Yarik
2 parents 43cb22d0 be900c94
Showing 3 changed files with 101 additions and 1 deletions Show diff stats
console/migrations/m161227_163047_alter_columns.php
frontend/views/cabinet/sales.php
frontend/web/css/cabinet-style.css
+<?php
+
+use yii\db\Migration;
+
+class m161227_163047_alter_columns extends Migration
+{
+    public function up()
+    {
+        $this->alterColumn('intellectual_property', 'registration_date', $this->string(255));
+        $this->alterColumn('intellectual_property', 'creation_date', $this->string(255));
+    }
+
+    public function down()
+    {
+    }
+}
@@ -136,7 +136,19 @@
             </div>
  
         </div>
-        
+      
+      <div class="btn-submit-blue">
+          <?php echo Html::button(
+              'Добавить',
+              [
+                  'type'        => 'button',
+                  'class'       => 'add-role-button',
+                  'data-toggle' => 'modal',
+                  'data-target' => '#add-composition-modal',
+              ]
+          ) ?>
+      </div>
+      
         <div class="style wrapp-tabs-table">
             <div class="style table-wrapp-2">
                 <div class="hidden-tables-oiv active-tab-oiv">
@@ -326,3 +338,70 @@
         ?>
     </div>
 </div>
+
+<!-- Modal -->
+<div class="modal fade" id="add-composition-modal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
+  <div class="modal-dialog" role="document">
+    <div class="modal-content">
+      <div class="modal-header">
+        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+          <span aria-hidden="true">&times;</span></button>
+        <h4 class="modal-title" id="myModalLabel">Додати твір</h4>
+      </div>
+        <?php
+            $form = ActiveForm::begin(
+                [
+                    'action' => 'add-int-prop',
+                    'id'     => 'add-int-prop-form',
+                ]
+            );
+            $addIntProp = new IntellectualProperty();
+        ?>
+      <div class="modal-body forms-cabinet forms-2">
+          
+          
+          
+          <?php
+              echo $form->field($addIntProp, 'title');
+          ?>
+          
+          <?php
+              echo $form->field($addIntProp, 'registration_date')->textInput([
+                                                                                 'class' => '_datepicker form-control',
+                                                                             ]);
+          ?>
+          
+          <?php
+              echo $form->field($addIntProp, 'genre');
+          ?>
+          
+          <?php
+              echo $form->field($addIntProp, 'author_role');
+          ?>
+          
+          <?php
+              echo $form->field($addIntProp, 'percent');
+          ?>
+          
+          <?php
+              echo $form->field($addIntProp, 'calculated');
+          ?>
+          
+          <?php
+              echo $form->field($addIntProp, 'play_count');
+          ?>
+
+      </div>
+      <div class="modal-footer btn-submit-blue">
+          <?php
+              echo Html::submitButton(
+                  'OK'
+              );
+          ?>
+      </div>
+        <?php
+            $form::end();
+        ?>
+    </div>
+  </div>
+</div>
 \ No newline at end of file
@@ -767,6 +767,11 @@ ul.list-cab li.active-li ul li.active-li-drop span.act_bg {
     float: left;
     margin-bottom: 20px;
 }
+.cab_content_list-dropdown .add-role-button {
+    float: left;
+    margin-left: 20px;
+    margin-top: 30px;
+}
  
 @media (max-width: 1566px) {
     /*.content-forms {padding-right: 20px;}*/