tesr

Goodluckhf · Dec 8, 2015 · 72f793e · 72f793e
1 parent 7436782
commit 72f793e
Show file tree

Hide file tree

Showing 7 changed files with 5,939 additions and 6 deletions.
diff --git a/css/datepicker.min.css b/css/datepicker.min.css
diff --git a/css/style.css b/css/style.css
@@ -75,3 +75,14 @@
 .post-message {
     white-space: pre-line;
 }
+.date-picker-div {
+    margin: 10px;
+}
+
+.date-picker {
+    background-color: #374850;
+    border: 1px solid transparent;
+    border-radius: 3px !important;
+    box-shadow: none;
+    height: 35px;
+}
diff --git a/index.html b/index.html
@@ -15,11 +15,13 @@
         <script src="/js/vendor/jquery-ui.js"></script>
         <script src="//vk.com/js/api/openapi.js" type="text/javascript"></script>
         <script src="/js/vendor/bootbox.js" type="text/javascript"></script>
+        <script src="/js/vendor/moment.js" type="text/javascript"></script>
+        <script src="/js/vendor/ru.js" type="text/javascript"></script>
+        <script src="/js/vendor/datepicker.min.js" type="text/javascript"></script>
 
         <script src="/js/EventsContainer.js" type="text/javascript"></script>
         <script src="/js/Request.js" type="text/javascript"></script>
         <script src="/js/AuthService.js" type="text/javascript"></script>
-        <script src="/js/datepicker.js" type="text/javascript"></script>
         <script src="/js/Posts.js" type="text/javascript"></script>
         <script src="/js/script.js" type="text/javascript"></script>
         <script type="text/javascript">
@@ -32,11 +34,11 @@
         <link rel='stylesheet' href="/css/bootstrap.css">
         <link rel='stylesheet' href="/css/AdminLTE.css">
         <link rel='stylesheet' href="/css/_all-skins.css">
-        <link rel='stylesheet' href="/css/datepicker.css">
+        <link rel='stylesheet' href="/css/datepicker.min.css">
         <link rel="stylesheet" href="https://code.ionicframework.com/ionicons/2.0.1/css/ionicons.min.css">
         <link rel='stylesheet' href="https://maxcdn.bootstrapcdn.com/font-awesome/4.4.0/css/font-awesome.min.css">
     </head>
-    <body class=" skin-green sidebar-mini">
+    <body class=" skin-green sidebar-mini fixed">
 
         <div class="wrapper">
 
@@ -149,8 +151,12 @@
 
 
 
-                        <li class="header">LABELS</li>
-
+                        <li class="header">Дата и время</li>
+                        <li>
+                            <div class="date-picker-div">
+                                <input type="text" placeholder="Дата поста" class="form-control date-picker">
+                            </div>
+                        </li>
 
 
                     </ul>

diff --git a/js/script.js b/js/script.js
@@ -1,7 +1,7 @@
 var App = (new function () {
     var events = new EventsContainer();
     events.register('ready');
-    
+
     this.contentSelector = 'section.content .tab-content';
 
     this.loadingBlock = function (block) {
@@ -46,6 +46,12 @@ $(function () {
         console.log({user: AuthService.user(), token: AuthService.token()});
         var str = '';
         bootbox.hideAll();
+        $('.date-picker').datetimepicker({
+            locale: 'ru',
+            stepping: 5,
+            toolbarPlacement: 'bottom'
+            //sideBySide: true
+        });
 
     });
     $('body').on('click', '.login', function () {