Work on ask module

pi-module · Aug 6, 2017 · 061a54c · 061a54c
1 parent 4ed4e16
commit 061a54c
Show file tree

Hide file tree

Showing 21 changed files with 509 additions and 206 deletions.
diff --git a/config/module.php b/config/module.php
@@ -14,12 +14,12 @@
     'meta'  => array(
         'title'         => _a('Ask'),
         'description'   => _a('Ask and Answer'),
-        'version'       => '0.2.2',
+        'version'       => '0.2.7',
         'license'       => 'New BSD',
         'logo'          => 'image/logo.png',
         'readme'        => 'docs/readme.txt',
         'demo'          => 'http://pialog',
-        'icon'          => 'fa-question',
+        'icon'          => 'fa-database',
         'clonable'      => true,
     ),
     // Author information

diff --git a/config/navigation.php b/config/navigation.php
@@ -21,6 +21,60 @@
             'module'        => 'ask',
             'controller'    => 'question',
             'action'        => 'index',
+            'params'        => array(
+                'type'    => 'all',
+            ),
+            'pages' => array(
+                'all' => array(
+                    'label'         => _a('List of all Questions and Answers'),
+                    'permission'    => array(
+                        'resource'  => 'question',
+                    ),
+                    'route'         => 'admin',
+                    'module'        => 'ask',
+                    'controller'    => 'question',
+                    'action'        => 'index',
+                    'params'        => array(
+                        'type'    => 'all',
+                    ),
+                ),
+                'question' => array(
+                    'label'         => _a('List of just Questions'),
+                    'permission'    => array(
+                        'resource'  => 'question',
+                    ),
+                    'route'         => 'admin',
+                    'module'        => 'ask',
+                    'controller'    => 'question',
+                    'action'        => 'index',
+                    'params'        => array(
+                        'type'    => 'question',
+                    ),
+                ),
+                'answer' => array(
+                    'label'         => _a('List of just Answers'),
+                    'permission'    => array(
+                        'resource'  => 'question',
+                    ),
+                    'route'         => 'admin',
+                    'module'        => 'ask',
+                    'controller'    => 'question',
+                    'action'        => 'index',
+                    'params'        => array(
+                        'type'    => 'answer',
+                    ),
+                ),
+                'update' => array(
+                    'label'         => _a('New question'),
+                    'permission'    => array(
+                        'resource'  => 'question',
+                    ),
+                    'route'         => 'admin',
+                    'module'        => 'ask',
+                    'controller'    => 'question',
+                    'action'        => 'update',
+                ),
+            ),
         ),
         'project' => array(
             'label'         => _a('projects'),
@@ -54,15 +108,5 @@
                 ),
             ),
         ),
-        'tools' => array(
-            'label'         => _a('Tools'),
-            'permission'    => array(
-                'resource'  => 'tools',
-            ),
-            'route'         => 'admin',
-            'module'        => 'ask',
-            'controller'    => 'tools',
-            'action'        => 'index',
-        ),
     ),
 );
diff --git a/config/page.php b/config/page.php
@@ -23,11 +23,6 @@
             'controller'    => 'project',
             'permission'    => 'project',
         ),
-        array(
-            'title'         => _a('Tools'),
-            'controller'    => 'tools',
-            'permission'    => 'tools',
-        ),
     ),
     // Front section
     'front' => array(

diff --git a/config/permission.php b/config/permission.php
@@ -47,11 +47,5 @@
                 //'admin',
             ),
         ),
-        'tools'       => array(
-            'title'         => _a('Tools'),
-            'access'        => array(
-                //'admin',
-            ),
-        ),
     ),
 );
diff --git a/locale/en/admin.mo b/locale/en/admin.mo
diff --git a/locale/en/admin.po b/locale/en/admin.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2017-08-06 12:35+0430\n"
+"POT-Creation-Date: 2017-08-06 13:38+0430\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -23,7 +23,7 @@ msgstr ""
 msgid "Show"
 msgstr ""
 
-#: config/config.php:24 config/page.php:53
+#: config/config.php:24 config/page.php:48
 msgid "Question"
 msgstr ""
 
@@ -111,36 +111,48 @@ msgstr ""
 msgid "List of Questions"
 msgstr ""
 
-#: config/navigation.php:26 config/navigation.php:36 config/page.php:22
+#: config/navigation.php:29
+msgid "List of all Questions and Answers"
+msgstr ""
+
+#: config/navigation.php:42
+msgid "List of just Questions"
+msgstr ""
+
+#: config/navigation.php:55
+msgid "List of just Answers"
+msgstr ""
+
+#: config/navigation.php:68
+msgid "New question"
+msgstr ""
+
+#: config/navigation.php:80 config/navigation.php:90 config/page.php:22
 #: config/permission.php:45
 msgid "projects"
 msgstr ""
 
-#: config/navigation.php:46
+#: config/navigation.php:100
 msgid "New project"
 msgstr ""
 
-#: config/navigation.php:58 config/page.php:27 config/permission.php:51
-msgid "Tools"
-msgstr ""
-
-#: config/page.php:35
+#: config/page.php:30
 msgid "Index page"
 msgstr ""
 
-#: config/page.php:41
+#: config/page.php:36
 msgid "Project page"
 msgstr ""
 
-#: config/page.php:47 config/permission.php:30
+#: config/page.php:42 config/permission.php:30
 msgid "Answer"
 msgstr ""
 
-#: config/page.php:59
+#: config/page.php:54
 msgid "Submit question"
 msgstr ""
 
-#: config/page.php:65
+#: config/page.php:60
 msgid "Tag"
 msgstr ""
 

diff --git a/locale/en/default.mo b/locale/en/default.mo