Merge branch 'laravel' into chanpter_progress

app/Http/Controllers/SentenceInfoController.php

@@ -106,21 +106,22 @@ class SentenceInfoController extends Controller
             $para_strlen = 0;
             foreach ($sentFinished as $sent) {
                 # code...
-                /*
-                $para_strlen += PaliSentence::where('book',$request->get('book'))
-                            ->where('paragraph',$sent->paragraph)
-                            ->where('word_begin',$sent->word_start)
-                            ->where('word_end',$sent->word_end)
-                            ->value('length');
-                */
-                $key_sent_id = $sent->book_id.'-'.$sent->paragraph.'-'.$sent->word_start.'-'.$sent->word_end;
-                $para_strlen += Cache::get(env('REDIS_NAMESPACE').'pali-sent/strlen/'.$key_sent_id, function() use($sent) {
-                    return PaliSentence::where('book',$sent->book_id)
-                            ->where('paragraph',$sent->paragraph)
-                            ->where('word_begin',$sent->word_start)
-                            ->where('word_end',$sent->word_end)
-                            ->value('length');
-                });
+                if($request->get('cache')=="1"){
+                    $key_sent_id = $sent->book_id.'-'.$sent->paragraph.'-'.$sent->word_start.'-'.$sent->word_end;
+                    $para_strlen += Cache::get(env('REDIS_NAMESPACE').'pali-sent/strlen/'.$key_sent_id, function() use($sent) {
+                        return PaliSentence::where('book',$sent->book_id)
+                                ->where('paragraph',$sent->paragraph)
+                                ->where('word_begin',$sent->word_start)
+                                ->where('word_end',$sent->word_end)
+                                ->value('length');
+                    });
+                }else{
+                    $para_strlen += PaliSentence::where('book',$request->get('book'))
+                                ->where('paragraph',$sent->paragraph)
+                                ->where('word_begin',$sent->word_start)
+                                ->where('word_end',$sent->word_end)
+                                ->value('length');                    
+                }
             }
 
             $percent = $para_strlen / $allStrLen;

public/app/palicanon/style.css

@@ -275,7 +275,7 @@ li.level_1.selected {
 }
 .book_view ul li {
 	width: 180px;
-	height: 250px;
+	height: 120px;
 	margin: 1em;
 	border: 10px solid wheat;
 }
@@ -283,3 +283,16 @@ li.level_1.selected {
 	display: flex;
 	flex-flow: wrap;
 }
+
+.chapter_list .more_info{
+    display:none;
+}
+.head_bar{
+    display:flex;
+}
+.book_view .list li {
+    width: 180px;
+    height: unset;
+    margin: unset;
+    border: unset;
+}

public/app/public/book_tag/en.json

@@ -13040,7 +13040,7 @@
 	{
 		"book": "209",
 		"para": "1433",
-		"level": "2",
+		"level": "1",
 		"title": "bhikkhunīvibhaṅgavaṇṇanā",
 		"tag": ":vajirabuddhi::ṭīkā::vinaya::suttavibhaṅga::bhikkhunīvibhaṅga::pācittiyapāḷi::bhikkhunī:"
 	},