codebase refactor

README.md

@@ -15,5 +15,5 @@ Read [Install](https://github.com/okulbilisim/ojs/tree/master/docs/INSTALL.md)
 ###TL;DR I'm a guru
 
 ```
-composer update -vvv -o&& bower update && php app/console assets:install web --symlink && php app/console assetic:dump && mysql -u root -p -e "DROP DATABASE IF EXISTS ojs;create database ojs;" && php app/console ojs:install && app/console ojs:install:initial-data
+composer update -vvv -o&& bower update && php app/console assets:install web --symlink && php app/console assetic:dump && mysql -u root -p -e "DROP DATABASE IF EXISTS ojs;create database ojs;" && php app/console ojs:install && php app/console ojs:install:samples
 ```

app/Resources/translations/messages.en.yml

@@ -598,16 +598,16 @@ journalcontact.singular: 'Contact'
 journalid: 'Journal ID'
 index.list: 'Journal Index List'
 journals: Journals
-journalsection: 'Journal Section'
-journalsection.allow_index: 'Allow Index'
-journalsection.edit: 'Edit Journal Section'
-journalsection.hide_title: 'Hide Title'
-journalsection.journal: Journal
-journalsection.label: Label
-journalsection.list: 'Journal Section List'
-journalsection.new: 'New Journal Section'
-journalsection.show: Show
-journalsection.title: Title
+section: 'Journal Section'
+section.allow_index: 'Allow Index'
+section.edit: 'Edit Journal Section'
+section.hide_title: 'Hide Title'
+section.journal: Journal
+section.label: Label
+section.list: 'Journal Section List'
+section.new: 'New Journal Section'
+section.show: Show
+section.title: Title
 journalindex.create: 'Journal Index Create'
 journalindex.edit: 'Journal Index Edit'
 journalindex.journal: Journal
@@ -1094,10 +1094,10 @@ title.journal_role_show: 'Show Journal Role'
 title.journal_role_show_journals: 'Show Journals'
 title.journal_role_show_users: 'Show Users'
 title.journal_roles: 'Journal Roles'
-title.journal_section_edit: 'Edit Section'
-title.journal_section_new: 'New Section'
-title.journal_section_show: 'Show Section'
-title.journal_sections: 'Sections'
+title.section_edit: 'Edit Section'
+title.section_new: 'New Section'
+title.section_show: 'Show Section'
+title.sections: 'Sections'
 title.journal_settings_mail: 'Mail Settings'
 title.journal_settings_submission: 'Submission Settings'
 title.journal_setup: 'Journal Setup'

app/Resources/translations/messages.tr.yml

@@ -598,16 +598,16 @@ journalcontact.singular: 'İletişim'
 journalid: 'Dergi ID'
 index.list: 'Dergi Dizin Listesi'
 journals: Dergiler
-journalsection: 'Dergi Bölümü'
-journalsection.allow_index: 'Dizine İzin Ver'
-journalsection.edit: 'Dergi Bölümü Düzenle'
-journalsection.hide_title: 'Başlığı Gizle'
-journalsection.journal: Dergi
-journalsection.label: Etiket
-journalsection.list: 'Dergi Bölüm Listesi'
-journalsection.new: 'Yeni Dergi Bölümü'
-journalsection.show: Göster
-journalsection.title: Başlık
+section: 'Dergi Bölümü'
+section.allow_index: 'Dizine İzin Ver'
+section.edit: 'Dergi Bölümü Düzenle'
+section.hide_title: 'Başlığı Gizle'
+section.journal: Dergi
+section.label: Etiket
+section.list: 'Dergi Bölüm Listesi'
+section.new: 'Yeni Dergi Bölümü'
+section.show: Göster
+section.title: Başlık
 journalindex.create: 'Dergi Dizini Oluştur'
 journalindex.edit: 'Dergi Dizini Düzenle'
 journalindex.journal: Dergi
@@ -1094,10 +1094,10 @@ title.journal_role_show: 'Dergi Rollerini Göster'
 title.journal_role_show_journals: 'Dergileri Göster'
 title.journal_role_show_users: 'Kullanıcıları Göster'
 title.journal_roles: 'Dergi Rolleri'
-title.journal_section_edit: 'Dergi Bölümünü Düzenle'
-title.journal_section_new: 'Yeni Dergi Bölümü'
-title.journal_section_show: 'Dergi Bölümü Göster'
-title.journal_sections: 'Dergi Bölümleri'
+title.section_edit: 'Dergi Bölümünü Düzenle'
+title.section_new: 'Yeni Dergi Bölümü'
+title.section_show: 'Dergi Bölümü Göster'
+title.sections: 'Dergi Bölümleri'
 title.journal_settings_mail: 'E-Posta Ayarları'
 title.journal_settings_submission: 'Gönderi Ayarları'
 title.journal_setup: 'Dergi Ayarları'

docs/Citations.md

@@ -10,26 +10,6 @@ Citation
 - **orderNum**
 
 
-
-
-CitationSetting
-----------------
-A key-value citation metadata container
-
-- **citationId **
-- **setting**
-- **value**
-
-**Sample Record**
-
------------------------------------------
-| id | citation_id | setting | value    |
-|----|-------------|---------|----------|
-|  1 |           1 | doi     | 32132132 |
-
-
-
-
 Description of Citation Types
 -----------------------------
 
@@ -164,7 +144,7 @@ Optional fields: month, year, key
 Standart Bibliographic Attributes
 --------------------------------
 
-Some Entity\CitationSetting::setting values
+Some Entity\Citation::settings values
 
 - **address**: Publisher's address (usually just the city, but can be the full address for lesser-known publishers)
 - **annote**: An annotation for annotated bibliography styles (not typical)

src/Ojs/CliBundle/Command/InstallCommand.php

@@ -317,13 +317,12 @@ protected function insertAcls()
             'OjsJournalBundle:PublisherTypes' => null,
             'OjsJournalBundle:JournalContact' => null,
             'OjsJournalBundle:ContactTypes' => null,
-            'OjsJournalBundle:JournalIndex' => null,
+            'OjsJournalBundle:Index' => null,
             'OjsJournalBundle:Author' => null,
             'OjsJournalBundle:PublisherTheme' => null,
             'OjsJournalBundle:Lang' => null,
             'OjsJournalBundle:PublisherDesign' => null,
             'OjsJournalBundle:Citation' => null,
-            'OjsJournalBundle:CitationSetting' => null,
             'OjsJournalBundle:Subject' => null,
             'OjsJournalBundle:ArticleTypes' => null,
             'OjsJournalBundle:Period' => null,

src/Ojs/CliBundle/Command/SamplesCommand.php

@@ -8,7 +8,7 @@
 use Ojs\JournalBundle\Entity\Citation;
 use Ojs\JournalBundle\Entity\Issue;
 use Ojs\JournalBundle\Entity\Journal;
-use Ojs\JournalBundle\Entity\JournalSection;
+use Ojs\JournalBundle\Entity\Section;
 use Ojs\JournalBundle\Entity\Lang;
 use Ojs\JournalBundle\Entity\Publisher;
 use Ojs\JournalBundle\Entity\Subject;
@@ -122,7 +122,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $em->persist($issue);
         $em->flush();
 
-        $section = new JournalSection();
+        $section = new Section();
         $section->setCurrentLocale('en');
         $section->setJournal($journal);
         $section->setTitle('Tutorials');

src/Ojs/JournalBundle/Controller/IssueController.php

@@ -13,7 +13,7 @@
 use Ojs\JournalBundle\Entity\ArticleRepository;
 use Ojs\JournalBundle\Entity\Issue;
 use Ojs\JournalBundle\Entity\Journal;
-use Ojs\JournalBundle\Entity\JournalSection;
+use Ojs\JournalBundle\Entity\Section;
 use Ojs\JournalBundle\Form\Type\IssueType;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Request;
@@ -60,8 +60,8 @@ function (Row $row) use ($request)
         $ta = $source->getTableAlias();
         $source->manipulateQuery(
             function (QueryBuilder $query) use ($ta, $journal) {
-                $query->andWhere($ta . '.journalId = :journal_id')
-                    ->setParameter('journal_id', $journal->getId());
+                $query->andWhere($ta . '.journal = :journal')
+                    ->setParameter('journal', $journal);
             }
         );
 
@@ -480,8 +480,8 @@ public function addArticleAction(Request $request, $id, $articleId)
         $section = null;
 
         if ($selectedSection) {
-            /** @var JournalSection $section */
-            $section = $em->getRepository('OjsJournalBundle:JournalSection')->findOneBy(
+            /** @var Section $section */
+            $section = $em->getRepository('OjsJournalBundle:Section')->findOneBy(
                 array(
                     'id' => $selectedSection,
                     'journal' => $journal